11

src/main/java/com/chinaitop/depot/rp/controller/BusinessRpReportController.java

@@ -241,6 +241,7 @@ public class BusinessRpReportController {
     public PageInfo<Map<String,Object>> getList(BusinessRpReportPageParam businessRpReportPageParam) throws Exception {
 
         List<Map<String,Object>> list = businessRpReportService.queryByExample(businessRpReportPageParam);
+
         PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(list);
         return pageInfo;
     }

src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpInboundMapper.java

@@ -25,6 +25,8 @@ public interface BusinessRpInboundMapper  {
 
     int insert(BusinessRpInbound record);
 
+    int insertSelective1(BusinessRpInbound record);
+
     int insertSelective(BusinessRpInbound record);
 
     List<BusinessRpInbound> selectByExample(BusinessRpInboundExample example);

src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpInboundMapper.xml

@@ -128,6 +128,16 @@
                 #{grainVarietyId,jdbcType=INTEGER}, #{grainNatureId,jdbcType=INTEGER}, #{quantity,jdbcType=DECIMAL},
                 #{productPeriod,jdbcType=INTEGER}, #{planQuantity,jdbcType=DECIMAL})
     </insert>
+    <insert id="insertSelective1"  useGeneratedKeys="true" keyProperty="id"   parameterType="com.chinaitop.depot.rp.model.BusinessRpInbound" >
+        insert into business_rp_inbound (id, createdate, updatename,
+                                         updatedate, rp_report_id, org_id,
+                                         grain_variety_id, grain_nature_id, quantity,
+                                         product_period, plan_quantity)
+        values (#{id,jdbcType=INTEGER}, #{createdate,jdbcType=TIMESTAMP}, #{updatename,jdbcType=VARCHAR},
+                #{updatedate,jdbcType=TIMESTAMP}, #{rpReportId,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER},
+                #{grainVarietyId,jdbcType=INTEGER}, #{grainNatureId,jdbcType=INTEGER}, #{sealingQuantity,jdbcType=DECIMAL},
+                #{productPeriod,jdbcType=INTEGER}, #{planQuantity,jdbcType=DECIMAL})
+    </insert>
     <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.rp.model.BusinessRpInbound" >
         insert into business_rp_inbound
         <trim prefix="(" suffix=")" suffixOverrides="," >
@@ -158,9 +168,9 @@
             <if test="quantity != null" >
                 quantity,
             </if>
-
+            <if test="storagePeriod != null" >
                 product_period,
-
+            </if>
             <if test="planQuantity != null" >
                 plan_quantity,
             </if>
@@ -190,12 +200,12 @@
             <if test="grainNatureId != null" >
                 #{grainNatureId,jdbcType=INTEGER},
             </if>
-
-                #{sealingQuantity,jdbcType=DECIMAL},
-
-
-                #{storagePeriod,jdbcType=INTEGER},
-
+            <if test="grainNatureId != null" >
+                #{quantity,jdbcType=DECIMAL},
+            </if>
+            <if test="productPeriod != null" >
+                #{productPeriod,jdbcType=INTEGER},
+            </if>
             <if test="planQuantity != null" >
                 #{planQuantity,jdbcType=DECIMAL},
             </if>

src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpOutboundMapper.xml

@@ -631,20 +631,13 @@
     FROM
         depot_qh.business_rp_report c
     INNER JOIN depot_qh.business_rp_outbound d ON d.rp_report_id = c.id
-    LEFT JOIN depot_qh.basic_storehouse st on st.storehouse_id = d.basic_storehouse_id
-    LEFT JOIN depot_qh.basic_warehouse wa on wa.warehouse_id = d.warehouse_id
-    LEFT JOIN depot_qh.basic_enum pz on pz.enumId = d.grain_variety_id
-    LEFT JOIN depot_qh.basic_enum xz on xz.enumId = d.grain_nature_id
-    LEFT JOIN depot_qh.basic_enum dj on dj.enumId = d.grain_grade_id
-    where 1=1
-
-        <if test="rpReportId !=null and rpReportId !=''">
-            and c.id = #{rpReportId}
-        </if>
-
-        <if test="orgId !=null and orgId !=''">
-            and d.org_Id = #{orgId}
-        </if>
+    LEFT JOIN depot_qh.basic_storehouse st on st.storehouse_id = d.basic_storehouse_id  -- 仓房
+    LEFT JOIN depot_qh.basic_warehouse wa on wa.warehouse_id = d.warehouse_id  -- 货位
+    LEFT JOIN depot_qh.basic_enum pz on pz.enumId = d.grain_variety_id -- 品种
+    LEFT JOIN depot_qh.basic_enum xz on xz.enumId = d.grain_nature_id  -- 性质
+    LEFT JOIN depot_qh.basic_enum dj on dj.enumId = d.grain_grade_id  -- 等级
+    where
+     c.id = #{rpReportId} and d.org_id = #{orgId}
     </select>
 
 </mapper>

src/main/java/com/chinaitop/depot/rp/service/impl/BusinessRpReportServiceImpl.java

@@ -151,7 +151,7 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
                     br.setCreatedate(new Date());
                     br.setUpdatedate(new Date());
                     br.setRpReportId(businessRpReport.getId());
-                    businessRpInboundMapper.insertSelective(br);
+                    businessRpInboundMapper.insertSelective1(br);
                 }
                 List<BusinessRpOutbound> outlist =businessRpReport.getBusinessRpOutboundList();
                 for (BusinessRpOutbound ou: outlist) {
@@ -183,7 +183,7 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
                 List<BusinessRpInbound> inList =businessRpReport.getBusinessRpInboundList();
                 for (BusinessRpInbound br: inList) {
                     br.setRpReportId(businessRpReport.getId());
-                    businessRpInboundMapper.insertSelective(br);
+                    businessRpInboundMapper.insertSelective1(br);
                 }
                 List<BusinessRpOutbound> outlist =businessRpReport.getBusinessRpOutboundList();
                 for (BusinessRpOutbound ou: outlist) {