成功

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

@@ -123,28 +123,7 @@ public class BusinessRpReportController {
         return orgInfoList;
     }
 
-//    /**
-//     * 根据warehouseId查询出库质检报告
-//     *
-//     * @param warehouseId
-//     * @return
-//     */
-//    @RequestMapping(value = "/findByWarehouseInfo",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
-//    @ApiOperation(value="根据warehouseId查询粮情卡数据", notes = "根据warehouseId查询粮情卡数据")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "form")
-//    })
-//    public BusinessRpOutboundVO findByQualityCheckInfo(Integer warehouseId) {
-//        BusinessRpOutboundVO businessRpOutboundVO=new BusinessRpOutboundVO();
-//        try {
-//
-//            businessRpOutboundVO = businessRpReportService.findByfindByQualityCheckInfo(warehouseId);
-//            return businessRpOutboundVO;
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        return businessRpOutboundVO;
-//    }
+
 
     //
     /**
@@ -160,26 +139,6 @@ public class BusinessRpReportController {
         return list;
     }
 
-    /**
-     * 查询质检报告
-     * @return
-     * @throws Exception
-     */
-//    @RequestMapping(value="/getQualityInspectionFindById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
-//    @ApiOperation(value="新增时得到查询质检报告", notes = "新增时得到查询质检报告")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "rpReportId", value = "轮换计划上报id", paramType = "form"),
-//            @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "form"),
-//            @ApiImplicitParam(name = "jylb", value = "检验类别", paramType = "form"),
-//            @ApiImplicitParam(name = "inspectionReportId", value = "质检报告id", paramType = "form")
-//
-//
-//    })
-//    public List<BusinessQcQualityInspection> getRpReportDetailsByAdd(String rpReportId, Integer warehouseId, String jylb,Integer inspectionReportId) throws Exception {
-//
-//        List<BusinessQcQualityInspection> list = businessRpReportService.getQualityInspectionFindById(rpReportId,warehouseId,jylb,inspectionReportId);
-//        return list;
-//    }
 
     /**
      * 根据货位查询粮情卡质检报告

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

@@ -168,7 +168,7 @@
             <if test="quantity != null" >
                 quantity,
             </if>
-            <if test="storagePeriod != null" >
+            <if test="productPeriod != null" >
                 product_period,
             </if>
             <if test="planQuantity != null" >
@@ -200,7 +200,7 @@
             <if test="grainNatureId != null" >
                 #{grainNatureId,jdbcType=INTEGER},
             </if>
-            <if test="grainNatureId != null" >
+            <if test="quantity != null" >
                 #{quantity,jdbcType=DECIMAL},
             </if>
             <if test="productPeriod != null" >
@@ -340,6 +340,7 @@ d.grain_nature_id,
 d.quantity,
 d.product_period,
 d.plan_quantity,
+ o.org_name orgName,
 pz.enumname as "grainVarietyName",
 xz.enumname as "grainNatureName"
 FROM
@@ -347,6 +348,7 @@ FROM
 INNER JOIN depot_qh.business_rp_inbound d ON d.rp_report_id = c.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.org_info o on d.org_id=o.org_id
     where 1=1
 
         <if test="rpReportId !=null and rpReportId !=''">

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

@@ -623,7 +623,8 @@
     d.inspection_report_id,
     d.regular_inspection_report_ids,
     d.plan_quantity,
-    st.storehouse_name as "basicStorehouseName",
+        o.org_name orgName,
+    st.storehouse_name as "storehouseName",
     wa.warehouse_name  as "warehouseName",
     pz.enumname as "grainVarietyName",
     xz.enumname as "grainNatureName",
@@ -631,11 +632,12 @@
     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  -- 等级
+    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
+    LEFT JOIN    depot_qh.org_info o on d.org_id=o.org_id
     where 1=1
         <if test="rpReportId !=null and rpReportId !=''">
             and c.id = #{rpReportId}

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

@@ -117,7 +117,6 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
     @Override
     public Map<String, Object> add(BusinessRpReport businessRpReport) {
         Map<String,Object> result = new HashMap<>();
-        result.put("status", "error");
         List<BusinessRpInbound>  businessRpInbound = businessRpReport.getBusinessRpInboundList();
 //        if (businessRpInbound.size() <= 0){
 //            result.put("msg", "出库信息不能为空");
@@ -134,12 +133,14 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
                 for (BusinessRpInbound br: inList) {
                     br.setCreatedate(new Date());
                     br.setUpdatedate(new Date());
+                    br.setRpReportId(businessRpReport.getId());
                     businessRpInboundMapper.insertSelective(br);
                 }
                 List<BusinessRpOutbound> outlist =businessRpReport.getBusinessRpOutboundList();
                 for (BusinessRpOutbound ou: outlist) {
                     ou.setCreatedate(new Date());
                     ou.setUpdatedate(new Date());
+                    ou.setRpReportId(businessRpReport.getId());
                     businessRpOutboundMapper.insertSelective(ou);
                 }
             }else{//保存
@@ -165,24 +166,37 @@ public class BusinessRpReportServiceImpl implements BusinessRpReportService {
         }else{//提交
 
             if(businessRpReport.getId()!=null){//修改
+                //根据id查找主表数据
+                BusinessRpReportVO businessRpReportVO =businessRpReportMapper.getRpReportFindByById(businessRpReport.getId());
+                if(businessRpReportVO!=null){
+                    result.put("status", "error");
+                    result.put("msg", "请填写数据后再执行上传操作");
+                }
                 businessRpReportMapper.updateByPrimaryKeySelective(businessRpReport);
-                businessRpInboundMapper.deleteByReportId(businessRpReport.getId());
-                businessRpOutboundMapper.deleteByReportId(businessRpReport.getId());
                 List<BusinessRpInbound> inList =businessRpReport.getBusinessRpInboundList();
-                for (BusinessRpInbound br: inList) {
-                    br.setCreatedate(new Date());
-                    br.setUpdatedate(new Date());
-                    br.setRpReportId(businessRpReport.getId());
-                    businessRpInboundMapper.insertSelective(br);
+                if(!inList.isEmpty()){
+                    businessRpInboundMapper.deleteByReportId(businessRpReport.getId());
+                    for (BusinessRpInbound br: inList) {
+                        br.setCreatedate(new Date());
+                        br.setUpdatedate(new Date());
+                        br.setRpReportId(businessRpReport.getId());
+                        businessRpInboundMapper.insertSelective(br);
+                    }
                 }
                 List<BusinessRpOutbound> outlist =businessRpReport.getBusinessRpOutboundList();
-                for (BusinessRpOutbound ou: outlist) {
-                    ou.setCreatedate(new Date());
-                    ou.setUpdatedate(new Date());
-                    ou.setRpReportId(businessRpReport.getId());
-                    businessRpOutboundMapper.insertSelective(ou);
-                }
+               if(!outlist.isEmpty()){
+                   businessRpOutboundMapper.deleteByReportId(businessRpReport.getId());
+                   for (BusinessRpOutbound ou: outlist) {
+                       ou.setCreatedate(new Date());
+                       ou.setUpdatedate(new Date());
+                       ou.setRpReportId(businessRpReport.getId());
+                       businessRpOutboundMapper.insertSelective(ou);
+                   }
+               }
+
+
             }else{//保存
+
                 businessRpReport.setCreateTime(new Date());
                 businessRpReport.setUpdateTime(new Date());
                 businessRpReportMapper.insert(businessRpReport);