购销计划通知单下拉

Signed-off-by: tangsong <86121657@qq.com>

src/main/java/com/unis/crk/common/controller/BillnonewController.java

@@ -78,7 +78,6 @@ public class BillnonewController {
      * @param unitId 单位id
      * @param spbh 商品编号
      * @param scrq 商品生产日期
-     * @param scrq 供应商Id
      * @return
      */
     @ApiOperation(value="查询", notes="得到生产批号")

src/main/java/com/unis/crk/common/service/impl/BillnonewServiceImpl.java

@@ -140,10 +140,12 @@ public class BillnonewServiceImpl extends ServiceImpl<BillnonewMapper, Billnonew
             DataCrkywGysDefault dataCrkywGysDefault = dataCrkywGysDefaultService.getById(gysId);
             if (dataCrkywGysDefault != null){
                 gysId = dataCrkywGysDefault.getSupplierNumber();
+            }else{
+                gysId = "";
             }
         }
         String date =  DateUtil.format(DateUtil.parse(scrq,"yyyy-MM-dd"),"yyyyMMdd");
-        return spbh+date+"_"+gysId;
+        return spbh+date+(StringUtils.isNotBlank(gysId)?"_"+gysId:"");
     }
 
     @Override

src/main/java/com/unis/crk/common/service/impl/DataCenterDownloadServiceImpl.java

@@ -183,7 +183,7 @@ public class DataCenterDownloadServiceImpl implements IDataCenterDownloadService
                         dataCrkywCpltzdxxFlt001.setWcsl(0.0); //完成数量
                         dataCrkywCpltzdxxFlt001.setSl(dataCrkywCpltzdxxFlt001.getJs() * Double.parseDouble(dataCrkywCpltzdxxFlt001.getGg())); //完成数量
                         dataCrkywCpltzdxxFlt001.setSysl(dataCrkywCpltzdxxFlt001.getSl()); //剩余数量
-                        dataCrkywCpltzdxxFlt001.setXz("952751"); //性质默认
+                        dataCrkywCpltzdxxFlt001.setXz("6871"); //性质默认
                         //剩余数量=数量-完成数量（0）
     //                    dataCrkywCpltzdxxFlt001.setSysl(dataCrkywCpltzdxxFlt001.getSl() - dataCrkywCpltzdxxFlt001.getWcsl());
                         if (StringUtils.isBlank(dataCrkywCpltzdxxFlt001.getBuilder())) {
@@ -1312,7 +1312,7 @@ public class DataCenterDownloadServiceImpl implements IDataCenterDownloadService
                     dataKcglCplkcbdDefault.setModifyDate(next.getModifiedTime());
                     dataKcglCplkcbdDefault.setBdhjs(next.getQuantity()+next.getInventoryQuantity()); //变动后件数
                     dataKcglCplkcbdDefault.setBdhsl((next.getInventoryQuantity() + next.getQuantity()) * Double.parseDouble(next.getMaterielModel()));//变动后件数
-                    dataKcglCplkcbdDefault.setBdhxz("952751");
+                    dataKcglCplkcbdDefault.setBdhxz("6871");
                     //获取商品信息
                     ArrayList<String> strings = new ArrayList<>();
                     strings.add(next.getMaterielNum());
@@ -1338,10 +1338,10 @@ public class DataCenterDownloadServiceImpl implements IDataCenterDownloadService
                     dataKcglCplkcbdDefault.setSjjlspmcbh(next.getMaterielNum());
                     dataKcglCplkcbdDefault.setBz("成品粮生产加工入库");
                     dataKcglCplkcbdDefault.setScrq(next.getManufactureDate());
-                    dataKcglCplkcbdDefault.setXz("952751");
+                    dataKcglCplkcbdDefault.setXz("6871");
                     dataKcglCplkcbdDefault.setYwsj(next.getCreatedTime());
                     dataKcglCplkcbdDefault.setBddh(next.getName());
-                    dataKcglCplkcbdDefault.setBdhxz("952751");
+                    dataKcglCplkcbdDefault.setBdhxz("6871");
 
                     cplkcbd.add(dataKcglCplkcbdDefault);
                     //新增修改时先删除
@@ -1480,8 +1480,8 @@ public class DataCenterDownloadServiceImpl implements IDataCenterDownloadService
 
             for (int i = 0; i < dataList.size(); i++) {
                 DataKcglCplkcbdDefault next = dataList.get(i);
-                next.setXz("952751");
-                next.setBdhxz("952751");
+                next.setXz("6871");
+                next.setBdhxz("6871");
                 next.setBdfs("14");
                 System.out.println(next.toString());
                 saveYc.add(next);
@@ -1544,8 +1544,8 @@ public class DataCenterDownloadServiceImpl implements IDataCenterDownloadService
 
             for (int i = 0; i < dataList.size(); i++) {
                 DataKcglCplkcbdDefault next = dataList.get(i);
-                next.setXz("952751");
-                next.setBdhxz("952751");
+                next.setXz("6871");
+                next.setBdhxz("6871");
                 next.setBdfs("14");
                 System.out.println(next.toString());
                 saveYc.add(next);

src/main/java/com/unis/crk/common/service/impl/UpdataLogServiceImpl.java

@@ -1460,7 +1460,7 @@ public class UpdataLogServiceImpl extends ServiceImpl<UpdataLogMapper, UpdataLog
                         dataCrkywCpltzdxxFlt001.setRoundID(0); //舍位id
                         dataCrkywCpltzdxxFlt001.setWcsl(0.0); //完成数量
                         dataCrkywCpltzdxxFlt001.setSysl(dataCrkywCpltzdxxFlt001.getSl()); //剩余数量
-                        dataCrkywCpltzdxxFlt001.setXz("952751"); //性质默认
+                        dataCrkywCpltzdxxFlt001.setXz("6871"); //性质默认
                         //剩余数量=数量-完成数量（0）
                         dataCrkywCpltzdxxFlt001.setSysl(dataCrkywCpltzdxxFlt001.getSl()-dataCrkywCpltzdxxFlt001.getWcsl());
                         if (StringUtils.isBlank(dataCrkywCpltzdxxFlt001.getBuilder())){

src/main/java/com/unis/crk/cplbusiness/controller/DataCrkywCpltzdxxDefaultController.java

@@ -4,6 +4,8 @@ import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.unis.crk.aop.SystemLog;
 import com.unis.crk.cplbusiness.entity.DataCrkywCpltzdxxDefault;
+import com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanDetailVO;
+import com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanVO;
 import com.unis.crk.cplbusiness.entity.vo.DataCrkywCpltzdxxDefaultVo;
 import com.unis.crk.cplbusiness.service.IDataCrkywCpltzdxxDefaultService;
 import com.unis.crk.utils.ResultUtil;
@@ -29,7 +31,7 @@ import java.util.Map;
  * @since 2022-03-23
  */
 @CrossOrigin
-@Api(value = "成品粮出入库订单",tags = {"成品粮出入库订单"})
+@Api(value = "成品粮购销计划单",tags = {"成品粮购销计划单"})
 @RestController
 @RequestMapping("dataCrkywCpltzdxxDefault")
 public class DataCrkywCpltzdxxDefaultController {
@@ -40,115 +42,141 @@ public class DataCrkywCpltzdxxDefaultController {
     @Autowired
     private IDataCrkywCpltzdxxDefaultService dataCrkywCpltzdxxDefaultService;
     /**
-     * 通过单位Id及作业类型得到成品粮通知单下拉列表
+     * 库级购销计划:通过单位Id及作业类型得到下拉列表
      * @param unitId 单位id
-     * @param zylx 作业类型：成品粮入库：3，成品粮出库：4
-     * @return
+     * @param planType 计划类型，1：销售计划；2：收购计划
+     * @returnT
      */
-    @ApiOperation(value="查询", notes="通过单位Id及作业类型得到成品粮通知单下拉列表")
-    @GetMapping({"/getCplTzdList/{unitId}/{zylx}","/getCplTzdList/{unitId}"})
-    public ResultUtil getCplTzdList(@PathVariable(value = "unitId",required = false) String unitId,@PathVariable(value = "zylx",required = false) String zylx) {
-        ResultUtil<List<Map<String,Object>>> data = new ResultUtil<>();
-        data.success(this.dataCrkywCpltzdxxDefaultService.getCplTzdList(unitId,zylx));
+    @ApiOperation(value="查询", notes="库级购销计划:通过单位Id及作业类型得到下拉列表")
+    @GetMapping({"/getPgGopsPlanList/{unitId}/{planType}"})
+    public ResultUtil getPgGopsPlanList(@PathVariable(value = "unitId") String unitId,@PathVariable(value = "planType") String planType) {
+        ResultUtil<List<BusinessPgGopsPlanVO>> data = new ResultUtil<>();
+        data.success(this.dataCrkywCpltzdxxDefaultService.getPgGopsPlanList(unitId,planType));
         return data;
     }
+
     /**
-     * 通过主表主键Id到成品粮通知单出入库从表列表
+     * 库级购销计划详情:通过主表主键Id得到列表
      * @param mainDataId 主表主键id
      */
-    @ApiOperation(value="查询", notes="通过主表主键Id到成品粮通知单出入库从表列表")
-    @GetMapping({"/getCplCrkTzdFltList/{mainDataId}"})
-    public ResultUtil getCplCrkTzdFltList(@PathVariable(value = "mainDataId",required = true) String mainDataId) {
-        ResultUtil<List<Map<String,Object>>> data = new ResultUtil<>();
-        data.success(this.dataCrkywCpltzdxxDefaultService.getCplCrkTzdFltList(mainDataId));
+    @ApiOperation(value="查询", notes="库级购销计划详情:通过主表主键Id得到列表")
+    @GetMapping({"/getPgGopsPlanDetailList/{mainDataId}"})
+    public ResultUtil getPgGopsPlanDetailList(@PathVariable(value = "mainDataId") String mainDataId) {
+        ResultUtil<List<BusinessPgGopsPlanDetailVO>> data = new ResultUtil<>();
+        data.success(this.dataCrkywCpltzdxxDefaultService.getPgGopsPlanDetailList(mainDataId));
         return data;
     }
 
     /**
+     * 通过单位Id及作业类型得到成品粮通知单下拉列表
+     * @param unitId 单位id
+     * @param zylx 作业类型：成品粮入库：3，成品粮出库：4
+     * @return
+     */
+//    @ApiOperation(value="查询", notes="通过单位Id及作业类型得到成品粮通知单下拉列表")
+//    @GetMapping({"/getCplTzdList/{unitId}/{zylx}","/getCplTzdList/{unitId}"})
+//    public ResultUtil getCplTzdList(@PathVariable(value = "unitId",required = false) String unitId,@PathVariable(value = "zylx",required = false) String zylx) {
+//        ResultUtil<List<Map<String,Object>>> data = new ResultUtil<>();
+//        data.success(this.dataCrkywCpltzdxxDefaultService.getCplTzdList(unitId,zylx));
+//        return data;
+//    }
+    /**
      * 通过主表主键Id到成品粮通知单出入库从表列表
      * @param mainDataId 主表主键id
      */
-    @ApiOperation(value="查询", notes="通过主表主键Id到成品粮通知单出入库从表列表")
-    @GetMapping({"/getCplCrkTzdFltListAndsp/{mainDataId}"})
-    public ResultUtil getCplCrkTzdFltListAndsp(@PathVariable(value = "mainDataId",required = true) String mainDataId) {
-        ResultUtil<Map<String,Object>> data = new ResultUtil<>();
-        data.success(this.dataCrkywCpltzdxxDefaultService.getCplCrkTzdFltListAndsp(mainDataId));
-        return data;
-    }
+//    @ApiOperation(value="查询", notes="通过主表主键Id到成品粮通知单出入库从表列表")
+//    @GetMapping({"/getCplCrkTzdFltList/{mainDataId}"})
+//    public ResultUtil getCplCrkTzdFltList(@PathVariable(value = "mainDataId",required = true) String mainDataId) {
+//        ResultUtil<List<Map<String,Object>>> data = new ResultUtil<>();
+//        data.success(this.dataCrkywCpltzdxxDefaultService.getCplCrkTzdFltList(mainDataId));
+//        return data;
+//    }
+
+    /**
+     * 通过主表主键Id到成品粮通知单出入库从表列表
+     * @param mainDataId 主表主键id
+     */
+//    @ApiOperation(value="查询", notes="通过主表主键Id到成品粮通知单出入库从表列表")
+//    @GetMapping({"/getCplCrkTzdFltListAndsp/{mainDataId}"})
+//    public ResultUtil getCplCrkTzdFltListAndsp(@PathVariable(value = "mainDataId",required = true) String mainDataId) {
+//        ResultUtil<Map<String,Object>> data = new ResultUtil<>();
+//        data.success(this.dataCrkywCpltzdxxDefaultService.getCplCrkTzdFltListAndsp(mainDataId));
+//        return data;
+//    }
     /**
      * 通过单位Id及作业类型得到成品粮通知单出入库下拉列表
      * @param unitId 单位id
      * @param zylx 作业类型：成品粮正常入库：3，成品粮出库：4，成品粮退货入库：5
      * @return
      */
-    @ApiOperation(value="查询", notes="成品粮(正常，退货)入库：3;成品粮出库：4。成品粮退货入库：5。成品粮正常入库：7")
-    @GetMapping({"/getCplCrkTzdList/{unitId}/{zylx}","/getCplCrkTzdList/{unitId}"})
-    public ResultUtil getCplCrkTzdList(@PathVariable(value = "unitId",required = false) String unitId,@PathVariable(value = "zylx",required = false) String zylx) {
-        ResultUtil<List<Map<String,Object>>> data = new ResultUtil<>();
-        data.success(this.dataCrkywCpltzdxxDefaultService.getCplCrkTzdList(unitId,zylx));
-        return data;
-    }
+//    @ApiOperation(value="查询", notes="成品粮(正常，退货)入库：3;成品粮出库：4。成品粮退货入库：5。成品粮正常入库：7")
+//    @GetMapping({"/getCplCrkTzdList/{unitId}/{zylx}","/getCplCrkTzdList/{unitId}"})
+//    public ResultUtil getCplCrkTzdList(@PathVariable(value = "unitId",required = false) String unitId,@PathVariable(value = "zylx",required = false) String zylx) {
+//        ResultUtil<List<Map<String,Object>>> data = new ResultUtil<>();
+//        data.success(this.dataCrkywCpltzdxxDefaultService.getCplCrkTzdList(unitId,zylx));
+//        return data;
+//    }
 
     /**
      * 根据ID查询数据
      * @param id
      * @return
      */
-    @ApiOperation(value="查询", notes="根据ID查询数据")
-    @GetMapping("getOne/{id}")
-    public ResultUtil getOne(@PathVariable("id") String id){
-        LOGGER.info("入参为:{}",id);
-        ResultUtil<DataCrkywCpltzdxxDefault> data = new ResultUtil<>();
-        if (StringUtils.isEmpty(id)){
-            data.failed("传入的主键为空");
-            return data;
-        }
-        data.success(this.dataCrkywCpltzdxxDefaultService.getOneData(id));
-        return data;
-    }
+//    @ApiOperation(value="查询", notes="根据ID查询数据")
+//    @GetMapping("getOne/{id}")
+//    public ResultUtil getOne(@PathVariable("id") String id){
+//        LOGGER.info("入参为:{}",id);
+//        ResultUtil<DataCrkywCpltzdxxDefault> data = new ResultUtil<>();
+//        if (StringUtils.isEmpty(id)){
+//            data.failed("传入的主键为空");
+//            return data;
+//        }
+//        data.success(this.dataCrkywCpltzdxxDefaultService.getOneData(id));
+//        return data;
+//    }
 
     /**
          * 分页高级查询
          * @return
          */
-    @ApiOperation(value="查询", notes="分页高级查询")
-    @PostMapping(value="/findPage")
-    public ResultUtil findPage(@RequestBody DataCrkywCpltzdxxDefaultVo pageQuery) {
-        ResultUtil<IPage<Map<String,Object>>> data = new ResultUtil<>();
-        data.success(this.dataCrkywCpltzdxxDefaultService.findPageVo(pageQuery));
-        return data;
-    }
+//    @ApiOperation(value="查询", notes="分页高级查询")
+//    @PostMapping(value="/findPage")
+//    public ResultUtil findPage(@RequestBody DataCrkywCpltzdxxDefaultVo pageQuery) {
+//        ResultUtil<IPage<Map<String,Object>>> data = new ResultUtil<>();
+//        data.success(this.dataCrkywCpltzdxxDefaultService.findPageVo(pageQuery));
+//        return data;
+//    }
 
     /**
      * 新增一条数据
      * @param param
      * @return
      */
-    @ApiOperation(value="新增", notes="新增一条数据")
-    @PostMapping("add")
-    @SystemLog(module = "成品通知单", methods = "新增",uploadName = "cpl.tzd")
-    public ResultUtil add(@RequestBody DataCrkywCpltzdxxDefault param){
-        LOGGER.info("入参为:{}", param);
-        ResultUtil<Boolean> data = new ResultUtil<>();
-        if (ObjectUtils.isEmpty(param)){
-            data.failed("所接收对象为null");
-            return data;
-        }
-        JSONObject ret = new JSONObject();
-        try{
-            ret  = this.dataCrkywCpltzdxxDefaultService.saveData(param);
-        }catch (Exception e){
-            ret.set("success", false);
-            ret.set("msg", e.getMessage());
-        }
-        if (ret.getBool("success")){
-            data.success(ret.getStr("msg"));
-        }else {
-            data.failed(ret.getStr("msg"));
-        }
-
-        return data;
-    }
+//    @ApiOperation(value="新增", notes="新增一条数据")
+//    @PostMapping("add")
+//    @SystemLog(module = "成品通知单", methods = "新增",uploadName = "cpl.tzd")
+//    public ResultUtil add(@RequestBody DataCrkywCpltzdxxDefault param){
+//        LOGGER.info("入参为:{}", param);
+//        ResultUtil<Boolean> data = new ResultUtil<>();
+//        if (ObjectUtils.isEmpty(param)){
+//            data.failed("所接收对象为null");
+//            return data;
+//        }
+//        JSONObject ret = new JSONObject();
+//        try{
+//            ret  = this.dataCrkywCpltzdxxDefaultService.saveData(param);
+//        }catch (Exception e){
+//            ret.set("success", false);
+//            ret.set("msg", e.getMessage());
+//        }
+//        if (ret.getBool("success")){
+//            data.success(ret.getStr("msg"));
+//        }else {
+//            data.failed(ret.getStr("msg"));
+//        }
+//
+//        return data;
+//    }
 
 
     /**
@@ -156,32 +184,32 @@ public class DataCrkywCpltzdxxDefaultController {
      * @param param
      * @return
      */
-    @ApiOperation(value="修改", notes="修改一条数据")
-    @PatchMapping("edit")
-    @SystemLog(module = "成品通知单", methods = "修改",uploadName = "cpl.tzd")
-    public ResultUtil edit(@RequestBody  DataCrkywCpltzdxxDefault param){
-        LOGGER.info("入参为:{}", param);
-        ResultUtil<Boolean> data = new ResultUtil<>();
-        if (ObjectUtils.isEmpty(param)){
-        data.failed("所接收对象为null");
-        return data;
-        }
-        JSONObject ret = new JSONObject();
-        try{
-            ret  = this.dataCrkywCpltzdxxDefaultService.update(param);
-        }catch (Exception e){
-            e.printStackTrace();
-            ret.set("success", false);
-            ret.set("msg", e.getMessage());
-        }
-        if (ret.getBool("success")){
-            data.success(ret.getStr("msg"));
-        }else {
-            data.failed(ret.getStr("msg"));
-        }
-
-        return data;
-    }
+//    @ApiOperation(value="修改", notes="修改一条数据")
+//    @PatchMapping("edit")
+//    @SystemLog(module = "成品通知单", methods = "修改",uploadName = "cpl.tzd")
+//    public ResultUtil edit(@RequestBody  DataCrkywCpltzdxxDefault param){
+//        LOGGER.info("入参为:{}", param);
+//        ResultUtil<Boolean> data = new ResultUtil<>();
+//        if (ObjectUtils.isEmpty(param)){
+//        data.failed("所接收对象为null");
+//        return data;
+//        }
+//        JSONObject ret = new JSONObject();
+//        try{
+//            ret  = this.dataCrkywCpltzdxxDefaultService.update(param);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            ret.set("success", false);
+//            ret.set("msg", e.getMessage());
+//        }
+//        if (ret.getBool("success")){
+//            data.success(ret.getStr("msg"));
+//        }else {
+//            data.failed(ret.getStr("msg"));
+//        }
+//
+//        return data;
+//    }
 
 
     /**
@@ -189,23 +217,23 @@ public class DataCrkywCpltzdxxDefaultController {
      * @param id
      * @return
      */
-    @ApiOperation(value="删除", notes="根据ID删除数据")
-    @DeleteMapping("delete/{id}")
-    @SystemLog(module = "成品通知单", methods = "删除",uploadName = "cpl.tzd")
-    public ResultUtil delete(@PathVariable("id") String id){
-        LOGGER.info("入参为:{}", id);
-        ResultUtil<Boolean> data = new ResultUtil<>();
-        if (StringUtils.isEmpty(id)){
-            data.failed("所接收id为null");
-            return data;
-        }
-        JSONObject ret  = this.dataCrkywCpltzdxxDefaultService.delete(id);
-        if (ret.getBool("success")){
-        data.success(ret.getStr("msg"));
-        }else {
-        data.failed(ret.getStr("msg"));
-        }
-        return data;
-    }
+//    @ApiOperation(value="删除", notes="根据ID删除数据")
+//    @DeleteMapping("delete/{id}")
+//    @SystemLog(module = "成品通知单", methods = "删除",uploadName = "cpl.tzd")
+//    public ResultUtil delete(@PathVariable("id") String id){
+//        LOGGER.info("入参为:{}", id);
+//        ResultUtil<Boolean> data = new ResultUtil<>();
+//        if (StringUtils.isEmpty(id)){
+//            data.failed("所接收id为null");
+//            return data;
+//        }
+//        JSONObject ret  = this.dataCrkywCpltzdxxDefaultService.delete(id);
+//        if (ret.getBool("success")){
+//        data.success(ret.getStr("msg"));
+//        }else {
+//        data.failed(ret.getStr("msg"));
+//        }
+//        return data;
+//    }
 }
 

src/main/java/com/unis/crk/cplbusiness/entity/result/BusinessPgGopsPlanDetailVO.java

@@ -0,0 +1,140 @@
+package com.unis.crk.cplbusiness.entity.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 成品粮监管-购销计划管理-明细表实体
+ *
+ * @author TS
+ * @date  2024/07/08 15:42
+ **/
+@Getter
+@Setter
+public class BusinessPgGopsPlanDetailVO {
+
+    /** 明细记录唯一标识符 */
+    @ApiModelProperty(value = "明细记录唯一标识符", position = 1)
+    private Integer ddcbid;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 2)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ModifyDate;
+
+
+    /** 商品；data_crkyw_cplsp_default的id； */
+    @ApiModelProperty(value = "商品；data_crkyw_cplsp_default的id；", position = 3)
+    private String crkywCplspDefaultId;
+
+    /** 性质Id */
+    @ApiModelProperty(value = "性质Id", position = 4)
+    private String xz;
+
+    /** 性质名称 */
+    @ApiModelProperty(value = "性质名称", position = 5)
+    private String xzValue;
+
+    /** 生产年份Id */
+    @ApiModelProperty(value = "生产年份Id", position = 5)
+    private String scnf;
+
+    /** 生产年份名称 */
+    @ApiModelProperty(value = "生产年份名称", position = 6)
+    private String scnfValue;
+
+    /** 产地Id */
+    @ApiModelProperty(value = "产地Id", position = 7)
+    private String cd;
+
+    /** 产地名称 */
+    @ApiModelProperty(value = "产地名称", position = 8)
+    private String cdValue;
+
+    /** 品种Id */
+    @ApiModelProperty(value = "品种Id", position = 9)
+    private String sjjlpzbh;
+
+    /** 品种名称 */
+    @ApiModelProperty(value = "品种名称", position = 10)
+    private String sjjlpzmc;
+
+    /** 等级Id */
+    @ApiModelProperty(value = "等级Id", position = 11)
+    private String sjjldjbh;
+
+    /** 等级名称 */
+    @ApiModelProperty(value = "等级名称", position = 12)
+    private String sjjldjmc;
+
+    /** 商品Id */
+    @ApiModelProperty(value = "商品Id", position = 13)
+    private String sjjlspmcbh;
+
+    /** 商品名称 */
+    @ApiModelProperty(value = "商品名称", position = 14)
+    private String sjjlspmc;
+
+    /** 品牌Id */
+    @ApiModelProperty(value = "品牌Id", position = 15)
+    private String sjjlppbh;
+
+    /** 商品名称 */
+    @ApiModelProperty(value = "sjjlppmc", position = 16)
+    private String sjjlppmc;
+
+
+    /** 数量 */
+    @ApiModelProperty(value = "数量", position = 17)
+    private BigDecimal sl;
+
+    /** 剩余数量 */
+    @ApiModelProperty(value = "剩余数量", position = 18)
+    private BigDecimal sysl;
+
+    /** 库存数量 */
+    @ApiModelProperty(value = "库存数量", position = 19)
+    private BigDecimal kcsl;
+
+    /** 库存件数 */
+    @ApiModelProperty(value = "库存件数", position = 20)
+    private BigDecimal syjs;
+
+    /** 仓库id */
+    @ApiModelProperty(value = "仓库id", position = 21)
+    private String ch;
+
+    @ApiModelProperty(value = "规格",position = 22)
+    private String gg;
+
+    @ApiModelProperty(value = "计量单位",position = 23)
+    private String jldw;
+
+    @ApiModelProperty(value = "计量单位名称",position = 24)
+    private String jldwmc;
+
+    @ApiModelProperty(value = "保质期",position = 25)
+    private String bzq;
+
+
+    @ApiModelProperty(value = "是含税 0是 1否", position = 26)
+    private String istax;
+
+    @ApiModelProperty(value = "税率", position = 27)
+    private Double taxrate;
+
+    /** 单价，单位：元 */
+    @ApiModelProperty(value = "单价，单位：元", position = 28)
+    private BigDecimal dj;
+
+    @ApiModelProperty(value = "完成数量", position = 29)
+    private BigDecimal wcsl;
+
+    @ApiModelProperty(value = "计划id", position = 30)
+    private Integer planId;
+}

src/main/java/com/unis/crk/cplbusiness/entity/result/BusinessPgGopsPlanVO.java

@@ -0,0 +1,83 @@
+package com.unis.crk.cplbusiness.entity.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 成品粮监管-购销计划管理表实体
+ *
+ * @author TS
+ * @date  2024/07/08 15:41
+ **/
+@Getter
+@Setter
+public class BusinessPgGopsPlanVO {
+
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private String DataID;
+
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 2)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ModifyDate;
+
+    /** 库区；org_info的id； */
+    @ApiModelProperty(value = "库区；org_info的id；", position = 3)
+    private String orgId;
+
+    /** 计划编号 */
+    @ApiModelProperty(value = "计划编号", position = 4)
+    private String tzdbm;
+
+    /** 计划名称 */
+    @ApiModelProperty(value = "计划名称", position = 5)
+    private String jhdmc;
+
+    /** 合同名称 */
+    @ApiModelProperty(value = "合同名称", position = 6)
+    private String htmc;
+
+
+    /** 计划类型，1：销售计划；2：收购计划； */
+    @ApiModelProperty(value = "计划类型，1：销售计划；2：收购计划；", position = 7)
+    private Integer cazylx;
+
+    /** 计划类型名称 */
+    @ApiModelProperty(value = "计划类型名称", position = 8)
+    private String cazylxmc;
+
+
+    /** 客户名称 */
+    @ApiModelProperty(value = "客户名称", position = 10)
+    private String kfmc;
+
+    /** 客户编号 */
+    @ApiModelProperty(value = "客户编号", position = 11)
+    private String kfbh;
+
+    /** 计划数量 */
+    @ApiModelProperty(value = "计划数量", position = 12)
+    private Integer sl;
+
+    /** 完成数量 */
+    @ApiModelProperty(value = "完成数量", position = 13)
+    private Integer wcsl;
+
+    /** 剩余数量 */
+    @ApiModelProperty(value = "剩余数量", position = 14)
+    private Integer sysl;
+
+    /** 商品名称 */
+    @ApiModelProperty(value = "商品名称", position = 15)
+    private String mxpzValue;
+
+
+}

src/main/java/com/unis/crk/cplbusiness/mapper/DataCrkywCpltzdxxDefaultMapper.java

@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.crk.cplbusiness.entity.DataCrkywCpltzdxxDefault;
+import com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanDetailVO;
+import com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -46,4 +49,29 @@ public interface DataCrkywCpltzdxxDefaultMapper extends BaseMapper<DataCrkywCplt
                                         @Param(value = "zylx")String zylx);
 
         IPage<Map<String, Object>> pfPage(Page<DataCrkywCpltzdxxDefault> p,@Param(Constants.WRAPPER)  QueryWrapper<DataCrkywCpltzdxxDefault> queryWrapper);
+
+    /**
+     * 通过单位Id及作业类型得到库级购销计划下拉列表
+     * @param unitId
+     * @param planType
+     * @return
+     */
+        List<BusinessPgGopsPlanVO> getPgGopsPlanList(@Param("unitId") String unitId, @Param("planType") String planType);
+    /**
+     * 库级购销计划详情:通过主表主键Id得到列表
+     *
+     * @param mainDataId 主表主键id
+     */
+    List<BusinessPgGopsPlanDetailVO> getPgGopsPlanDetailList(@Param("mainDataId")String mainDataId);
+
+    /**
+     * 库级购销计划从表详情
+     * @param ddcbid
+     * @return
+     */
+    BusinessPgGopsPlanDetailVO getPgGopsPlanDetail(@Param("ddcbid") String ddcbid);
+
+    void updatePgGopsPlanDetail(@Param("wcsl")BigDecimal wcsl, @Param("ddcbid")Integer ddcbid);
+
+    void updatePgGopsPlan(@Param("wcsl")BigDecimal wcsl, @Param("sjjlje")BigDecimal sjjlje, @Param("mainDataId")Integer mainDataId);
 }

src/main/java/com/unis/crk/cplbusiness/service/IDataCrkywCpltzdxxDefaultService.java

@@ -4,6 +4,8 @@ import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.unis.crk.cplbusiness.entity.DataCrkywCpltzdxxDefault;
+import com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanDetailVO;
+import com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanVO;
 import com.unis.crk.cplbusiness.entity.vo.DataCrkywCplpfDefaultVo;
 import com.unis.crk.cplbusiness.entity.vo.DataCrkywCpltzdxxDefaultVo;
 
@@ -85,4 +87,27 @@ public interface IDataCrkywCpltzdxxDefaultService extends IService<DataCrkywCplt
         IPage<Map<String,Object>> findPagepfDefaultVo(DataCrkywCplpfDefaultVo pageQuery);
 
         Map<String,Object> getCplCrkTzdFltListAndsp(String mainDataId);
+
+        /**
+         * 通过单位Id及作业类型得到库级购销计划下拉列表
+         * @param unitId 单位id
+         * @param planType 计划类型，1：销售计划；2：收购计划
+         * @returnT
+         */
+        List<BusinessPgGopsPlanVO> getPgGopsPlanList(String unitId, String planType);
+        /**
+         * 库级购销计划详情:通过主表主键Id得到列表
+         * @param mainDataId 主表主键id
+         */
+        List<BusinessPgGopsPlanDetailVO> getPgGopsPlanDetailList(String mainDataId);
+
+        /**
+         * 库级购销计划:变更主从表完成数量
+         * @param ddcbid 购销计划从表id
+         * @param sjjlsl 重量
+         * @param sjjlje 金额
+         * @param spmc 商品名称
+         * @return
+         */
+        boolean updatePgGopsPlanQuantity(String ddcbid,Double sjjlsl,Double sjjlje,String spmc);
 }

src/main/java/com/unis/crk/cplbusiness/service/impl/DataCrkywCplckFlt001ServiceImpl.java

@@ -72,12 +72,12 @@ public class DataCrkywCplckFlt001ServiceImpl extends ServiceImpl<DataCrkywCplckF
         }
         //性质默认值
         if(StrUtil.isBlank(flt001.getXz())){
-            flt001.setXz("952751");
+            flt001.setXz("6871");
         }
         //数量=件数*规格
         flt001.setSjjlsl(flt001.getJs()*Double.parseDouble(flt001.getGg()) );
-        //金额=数理*单价
-        flt001.setJe(flt001.getSjjlsl()*flt001.getDj());
+        //金额=件数*单价
+        flt001.setJe(flt001.getJs()*flt001.getDj());
         if (!super.saveOrUpdate(flt001)) { //
             throw new Exception(flt001.getSjjlspmc()+":保存成品粮入库从表失败");
         }
@@ -99,8 +99,9 @@ public class DataCrkywCplckFlt001ServiceImpl extends ServiceImpl<DataCrkywCplckF
 
         //更新通知单
         String ddcbid = flt001.getDdcbid();
-        if(!hasBlank(ddcbid)){
-            DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
+        if(!hasBlank(ddcbid)){ //更新购销计划数量
+            dataCrkywCpltzdxxDefaultService.updatePgGopsPlanQuantity(ddcbid,sjjlsl,flt001.getJe(),flt001.getSjjlspmc());
+          /*  DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
             if (byId != null) {
                 Double sysl = byId.getSysl();
                 Double wcsl = byId.getWcsl();
@@ -125,7 +126,7 @@ public class DataCrkywCplckFlt001ServiceImpl extends ServiceImpl<DataCrkywCplckF
                     }
                     dataCrkywCpltzdxxDefaultService.updateById(main);
                 }
-            }
+            }*/
         }
         jsonObject.set("success", true);
         jsonObject.set("msg", "保存成功");
@@ -166,8 +167,9 @@ public class DataCrkywCplckFlt001ServiceImpl extends ServiceImpl<DataCrkywCplckF
         }
 
         String ddcbid = flt001.getDdcbid();
-        if(!hasBlank(ddcbid)){
-            DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
+        if(!hasBlank(ddcbid)){ //更新购销计划数量
+            dataCrkywCpltzdxxDefaultService.updatePgGopsPlanQuantity(ddcbid,editZl,0.0,flt001.getSjjlspmc());
+           /* DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
             if (byId != null){
                 Double sysl = byId.getSysl();
                 Double wcsl = byId.getWcsl();
@@ -190,7 +192,7 @@ public class DataCrkywCplckFlt001ServiceImpl extends ServiceImpl<DataCrkywCplckF
                     }
                     dataCrkywCpltzdxxDefaultService.updateById(main);
                 }
-            }
+            }*/
         }
         jsonObject.set("success", true);
         jsonObject.set("msg", "修改成功");
@@ -229,8 +231,9 @@ public class DataCrkywCplckFlt001ServiceImpl extends ServiceImpl<DataCrkywCplckF
             jsonObject.set("msg", entity.getSjjlspmc()+":删除仓储数据失败");
             throw new RuntimeException(entity.getSjjlspmc()+":删除仓储数据失败");
         }
-        if(!hasBlank(ddcbid)){
-            DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
+        if(!hasBlank(ddcbid)){ //更新购销计划数量
+            dataCrkywCpltzdxxDefaultService.updatePgGopsPlanQuantity(ddcbid,sjjlsl*-1,entity.getJe()*-1,entity.getSjjlspmc());
+           /* DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
             if (byId != null){
                 Double sysl = byId.getSysl();
                 Double wcsl = byId.getWcsl();
@@ -250,7 +253,7 @@ public class DataCrkywCplckFlt001ServiceImpl extends ServiceImpl<DataCrkywCplckF
                     }
                     dataCrkywCpltzdxxDefaultService.updateById(main);
                 }
-            }
+            }*/
         }
         jsonObject.set("success", true);
         jsonObject.set("msg", "删除成功");

src/main/java/com/unis/crk/cplbusiness/service/impl/DataCrkywCplfjDefaultServiceImpl.java

@@ -73,7 +73,7 @@ public class DataCrkywCplfjDefaultServiceImpl extends ServiceImpl<DataCrkywCplfj
             flt001.setUnitid(unitId);// 设置单位id
             //性质默认值
             if(StrUtil.isBlank(flt001.getXz())){
-                flt001.setXz("952751");
+                flt001.setXz("6871");
             }
             //数量=件数*规格
             flt001.setSjjlsl(flt001.getJs()*Double.parseDouble(flt001.getGg()) );
@@ -142,7 +142,7 @@ public class DataCrkywCplfjDefaultServiceImpl extends ServiceImpl<DataCrkywCplfj
                 flt001.setUnitid(param.getUnitid());//
                 //性质默认值
                 if(StrUtil.isBlank(flt001.getXz())){
-                    flt001.setXz("952751");
+                    flt001.setXz("6871");
                 }
                 //数量=件数*规格
                 flt001.setSjjlsl(flt001.getJs()*Double.parseDouble(flt001.getGg()) );

src/main/java/com/unis/crk/cplbusiness/service/impl/DataCrkywCplrkDefaultServiceImpl.java

@@ -88,24 +88,24 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
             dataId=s;
             param.setDataId(s);
         }
-        //非暂存保存结算数据
+        //青海无此业务 非暂存保存结算数据
         if(!"0".equals(param.getIsstaging())){
-            SettlementManagement settlementManagement = new SettlementManagement();
-            settlementManagement.setReceiptDocNo(param.getRkbh());//入库编号
-            settlementManagement.setOrderNo(param.getDdbh());//订单编号
-            settlementManagement.setSupplierName(param.getGys());
-            settlementManagement.setTradeName(param.getSjjlspmc());
-            settlementManagement.setUnitid(unitId);
-            settlementManagement.setBuilderDate(new Date());
-            settlementManagement.setBuilder("系统自动生成");
-            settlementManagement.setWarehousingTime(param.getYwsj());
-            settlementManagement.setAuditStatus("0");
-            settlementManagementService.save(settlementManagement);
+//            SettlementManagement settlementManagement = new SettlementManagement();
+//            settlementManagement.setReceiptDocNo(param.getRkbh());//入库编号
+//            settlementManagement.setOrderNo(param.getDdbh());//订单编号
+//            settlementManagement.setSupplierName(param.getGys());
+//            settlementManagement.setTradeName(param.getSjjlspmc());
+//            settlementManagement.setUnitid(unitId);
+//            settlementManagement.setBuilderDate(new Date());
+//            settlementManagement.setBuilder("系统自动生成");
+//            settlementManagement.setWarehousingTime(param.getYwsj());
+//            settlementManagement.setAuditStatus("0");
+//            settlementManagementService.save(settlementManagement);
         }
         //得到从表数据
         List<DataCrkywCplrkFlt001> flt001s = param.getFltList();
         if (flt001s == null || flt001s.size() <= 0){
-            throw new Exception("成品粮入库商品信息为空失败");
+            throw new Exception("成品粮入库商品信息不能为空");
         }
         String spmc = "";
         for (int i = 0; i < flt001s.size(); i++) {
@@ -113,25 +113,27 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
             DataCrkywCplrkFlt001 flt001 = flt001s.get(i);
             flt001.setMainDataId(dataId);// 设置主表ID
             flt001.setUnitid(unitId);// 设置单位id
-            SysParams byId = sysParamsService.getById("sy.url");
-            String paramVal = byId.getParamVal();
-            String syurl=paramVal+"/"+unitId+"/"+param.getCh()+"/"+param.getHwh()+"/"+flt001.getSjjlspmcbh()+"/"+param.getRkbh()+"/"+flt001.getScpc();
-            flt001.setSyurl(syurl);
+            //青海无溯源业务
+//            SysParams byId = sysParamsService.getById("sy.url");
+//            String paramVal = byId.getParamVal();
+//            String syurl=paramVal+"/"+unitId+"/"+param.getCh()+"/"+param.getHwh()+"/"+flt001.getSjjlspmcbh()+"/"+param.getRkbh()+"/"+flt001.getScpc();
+//            flt001.setSyurl(syurl);
             //非暂存保存入库数据和评分数据
             if(!"0".equals(param.getIsstaging())) {
                 spmc += flt001.getSjjlspmc() + ",";
                 flt001.setIsstaging("1");
                 //有订单时，自动新增评分数据
                 if (StrUtil.isNotBlank(param.getDdbh())) {
-                    DataCrkywCplpfDefault dataCrkywCplpfDefault = new DataCrkywCplpfDefault();
-                    dataCrkywCplpfDefault.setScpc(flt001.getScpc());
-                    dataCrkywCplpfDefault.setSjjlspmcbh(flt001.getSjjlspmcbh());
-                    dataCrkywCplpfDefault.setTzdbm(param.getDdbh());
-                    dataCrkywCplpfDefault.setUnitid(param.getUnitid());
-                    dataCrkywCplpfDefault.setCjsj(param.getCjsj());
-                    dataCrkywCplpfDefault.setRkbh(param.getRkbh());
-                    dataCrkywCplpfDefault.setRksj(param.getYwsj());
-                    dataCrkywCplpfDefaultService.save(dataCrkywCplpfDefault);
+                    //青海无此业务
+//                    DataCrkywCplpfDefault dataCrkywCplpfDefault = new DataCrkywCplpfDefault();
+//                    dataCrkywCplpfDefault.setScpc(flt001.getScpc());
+//                    dataCrkywCplpfDefault.setSjjlspmcbh(flt001.getSjjlspmcbh());
+//                    dataCrkywCplpfDefault.setTzdbm(param.getDdbh());
+//                    dataCrkywCplpfDefault.setUnitid(param.getUnitid());
+//                    dataCrkywCplpfDefault.setCjsj(param.getCjsj());
+//                    dataCrkywCplpfDefault.setRkbh(param.getRkbh());
+//                    dataCrkywCplpfDefault.setRksj(param.getYwsj());
+//                    dataCrkywCplpfDefaultService.save(dataCrkywCplpfDefault);
                     dataCrkywCplrkFlt001Service.saveFlt(flt001);
                 }
             }else{ //暂存只保存数据，不涉及业务
@@ -174,31 +176,33 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
         QueryWrapper<DataCrkywCplrkFlt001> Wrapper = new QueryWrapper<>();
         Wrapper.eq("MainDataID", param.getDataId());
         List<DataCrkywCplrkFlt001> oldFlt001s = dataCrkywCplrkFlt001Service.list(Wrapper);
-        //得到结算数据并修改结算数据
-        QueryWrapper<SettlementManagement> settlementQueryWrapper = new QueryWrapper<>();
-        Wrapper.eq("receipt_doc_no", param.getRkbh());
-        List<SettlementManagement> list = settlementManagementService.list(settlementQueryWrapper);
-        if(list.size()>0 && "1".equals(param.getIsstaging())){ //非暂存时修改结算数据
-            SettlementManagement settlementManagement = list.get(0);
-            settlementManagement.setReceiptDocNo(param.getRkbh());//入库编号
-            settlementManagement.setOrderNo(param.getDdbh());//订单编号
-            settlementManagement.setSupplierName(param.getGys());
-            settlementManagement.setTradeName(param.getSjjlspmc());
-            settlementManagement.setUpdateTime(new Date());
-            settlementManagement.setWarehousingTime(param.getYwsj());
-            settlementManagement.setAuditStatus("0");
-            settlementManagementService.update(settlementManagement);
-        }
+        //青海无此业务 得到结算数据并修改结算数据
+//        QueryWrapper<SettlementManagement> settlementQueryWrapper = new QueryWrapper<>();
+//        Wrapper.eq("receipt_doc_no", param.getRkbh());
+//        List<SettlementManagement> list = settlementManagementService.list(settlementQueryWrapper);
+//        if(list.size()>0 && "1".equals(param.getIsstaging())){ //非暂存时修改结算数据
+//            SettlementManagement settlementManagement = list.get(0);
+//            settlementManagement.setReceiptDocNo(param.getRkbh());//入库编号
+//            settlementManagement.setOrderNo(param.getDdbh());//订单编号
+//            settlementManagement.setSupplierName(param.getGys());
+//            settlementManagement.setTradeName(param.getSjjlspmc());
+//            settlementManagement.setUpdateTime(new Date());
+//            settlementManagement.setWarehousingTime(param.getYwsj());
+//            settlementManagement.setAuditStatus("0");
+//            settlementManagementService.update(settlementManagement);
+//        }
         String isstaging = param.getIsstaging();
 
         List<DataCrkywCplrkFlt001> newFlt001s = param.getFltList();
         String spmcz = "";
         for (int j = 0; j < newFlt001s.size(); j++) {
             DataCrkywCplrkFlt001 newFlt001 = newFlt001s.get(j);
-            SysParams byId = sysParamsService.getById("sy.url");
-            String syurl=byId+"/"+param.getUnitid()+"/"+param.getCh()+"/"+param.getHwh()+"/"+newFlt001.getSjjlspmcbh()+"/"+param.getRkbh()+"/"+newFlt001.getScpc();
+            //溯源地址，青海 无此业务
+//            SysParams byId = sysParamsService.getById("sy.url");
+//            String syurl=byId+"/"+param.getUnitid()+"/"+param.getCh()+"/"+param.getHwh()+"/"+newFlt001.getSjjlspmcbh()+"/"+param.getRkbh()+"/"+newFlt001.getScpc();
+//            newFlt001.setSyurl(syurl);
+
             spmcz += newFlt001.getSjjlspmc() + ",";
-            newFlt001.setSyurl(syurl);
             if (StrUtil.isBlank(newFlt001.getDataId())){ //新增
                 insertFlt.add(newFlt001);
             }
@@ -227,18 +231,18 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
             QueryWrapper<DataCrkywCplrkFlt001> wrapper = new QueryWrapper<>();
             wrapper.eq("MainDataID", param.getDataId());
             dataCrkywCplrkFlt001Service.remove(wrapper);
-            //结算数据
-            SettlementManagement settlementManagement = new SettlementManagement();
-            settlementManagement.setReceiptDocNo(param.getRkbh());//入库编号
-            settlementManagement.setOrderNo(param.getDdbh());//订单编号
-            settlementManagement.setSupplierName(param.getGys());
-            settlementManagement.setTradeName(param.getSjjlspmc());
-            settlementManagement.setUnitid(unitId);
-            settlementManagement.setBuilderDate(new Date());
-            settlementManagement.setBuilder("系统自动生成");
-            settlementManagement.setWarehousingTime(param.getYwsj());
-            settlementManagement.setAuditStatus("0");
-            settlementManagementService.save(settlementManagement);
+            //青海无此业务 结算数据
+//            SettlementManagement settlementManagement = new SettlementManagement();
+//            settlementManagement.setReceiptDocNo(param.getRkbh());//入库编号
+//            settlementManagement.setOrderNo(param.getDdbh());//订单编号
+//            settlementManagement.setSupplierName(param.getGys());
+//            settlementManagement.setTradeName(param.getSjjlspmc());
+//            settlementManagement.setUnitid(unitId);
+//            settlementManagement.setBuilderDate(new Date());
+//            settlementManagement.setBuilder("系统自动生成");
+//            settlementManagement.setWarehousingTime(param.getYwsj());
+//            settlementManagement.setAuditStatus("0");
+//            settlementManagementService.save(settlementManagement);
 
             //新增保存入库子表数据
             String spmc = "";
@@ -247,26 +251,27 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
                 DataCrkywCplrkFlt001 flt001 =  param.getFltList().get(i);
                 flt001.setMainDataId(dataId);// 设置主表ID
                 flt001.setUnitid(unitId);// 设置单位id
-                SysParams byId = sysParamsService.getById("sy.url");
-                String paramVal = byId.getParamVal();
-                String syurl=paramVal+"/"+unitId+"/"+param.getCh()+"/"+param.getHwh()+"/"+flt001.getSjjlspmcbh()+"/"+param.getRkbh()+"/"+flt001.getScpc();
-                flt001.setSyurl(syurl);
+                //青海无此业务
+//                SysParams byId = sysParamsService.getById("sy.url");
+//                String paramVal = byId.getParamVal();
+//                String syurl=paramVal+"/"+unitId+"/"+param.getCh()+"/"+param.getHwh()+"/"+flt001.getSjjlspmcbh()+"/"+param.getRkbh()+"/"+flt001.getScpc();
+//                flt001.setSyurl(syurl);
                 //非暂存保存入库数据和评分数据
                     spmc += flt001.getSjjlspmc() + ",";
                     flt001.setIsstaging("1");
-                    //有订单时，自动新增评分数据
-                    if (StrUtil.isNotBlank(param.getDdbh())) {
-                        DataCrkywCplpfDefault dataCrkywCplpfDefault = new DataCrkywCplpfDefault();
-                        dataCrkywCplpfDefault.setScpc(flt001.getScpc());
-                        dataCrkywCplpfDefault.setSjjlspmcbh(flt001.getSjjlspmcbh());
-                        dataCrkywCplpfDefault.setTzdbm(param.getDdbh());
-                        dataCrkywCplpfDefault.setUnitid(param.getUnitid());
-                        dataCrkywCplpfDefault.setCjsj(param.getCjsj());
-                        dataCrkywCplpfDefault.setRkbh(param.getRkbh());
-                        dataCrkywCplpfDefault.setRksj(param.getYwsj());
-                        dataCrkywCplpfDefaultService.save(dataCrkywCplpfDefault);
-                        dataCrkywCplrkFlt001Service.saveFlt(flt001);
-                    }
+//                    //有订单时，自动新增评分数据 青海无此业务
+//                    if (StrUtil.isNotBlank(param.getDdbh())) {
+//                        DataCrkywCplpfDefault dataCrkywCplpfDefault = new DataCrkywCplpfDefault();
+//                        dataCrkywCplpfDefault.setScpc(flt001.getScpc());
+//                        dataCrkywCplpfDefault.setSjjlspmcbh(flt001.getSjjlspmcbh());
+//                        dataCrkywCplpfDefault.setTzdbm(param.getDdbh());
+//                        dataCrkywCplpfDefault.setUnitid(param.getUnitid());
+//                        dataCrkywCplpfDefault.setCjsj(param.getCjsj());
+//                        dataCrkywCplpfDefault.setRkbh(param.getRkbh());
+//                        dataCrkywCplpfDefault.setRksj(param.getYwsj());
+//                        dataCrkywCplpfDefaultService.save(dataCrkywCplpfDefault);
+//                    }
+                dataCrkywCplrkFlt001Service.saveFlt(flt001);
             }
             param.setSjjlspmc(spmc.substring(0,spmc.length()-1));
             if (!super.saveOrUpdate(param)) { //
@@ -366,19 +371,19 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
                 //保存从表数据，有错误抛异常
                 DataCrkywCplrkFlt001 flt001 = flt001s.get(i);
                 dataCrkywCplrkFlt001Service.deleteFlt(flt001.getDataId());
-                //删除评分
-                QueryWrapper<DataCrkywCplpfDefault> dataCrkywCplpfDefault = new QueryWrapper<>();
-                dataCrkywCplpfDefault.eq("cjsj",entity.getCjsj());
-                dataCrkywCplpfDefault.eq("scpc",flt001.getScpc());
-                List<DataCrkywCplpfDefault> list1 = dataCrkywCplpfDefaultService.list(dataCrkywCplpfDefault);
-                if(list1.size()>0){
-                    Iterator<DataCrkywCplpfDefault> iterator = list1.iterator();
-                    while (iterator.hasNext()){
-                        DataCrkywCplpfDefault next = iterator.next();
-                        dataCrkywCplpfDefaultService.delete(next.getDataId());
-                        deleteDataRecordService.save(next.getDataId(),"data_crkyw_cplpf_default",next.getUnitid(),new Date());
-                    }
-                }
+                //青海无此业务 删除评分
+//                QueryWrapper<DataCrkywCplpfDefault> dataCrkywCplpfDefault = new QueryWrapper<>();
+//                dataCrkywCplpfDefault.eq("cjsj",entity.getCjsj());
+//                dataCrkywCplpfDefault.eq("scpc",flt001.getScpc());
+//                List<DataCrkywCplpfDefault> list1 = dataCrkywCplpfDefaultService.list(dataCrkywCplpfDefault);
+//                if(list1.size()>0){
+//                    Iterator<DataCrkywCplpfDefault> iterator = list1.iterator();
+//                    while (iterator.hasNext()){
+//                        DataCrkywCplpfDefault next = iterator.next();
+//                        dataCrkywCplpfDefaultService.delete(next.getDataId());
+//                        deleteDataRecordService.save(next.getDataId(),"data_crkyw_cplpf_default",next.getUnitid(),new Date());
+//                    }
+//                }
             }
         }
         jsonObject.set("success", true);

src/main/java/com/unis/crk/cplbusiness/service/impl/DataCrkywCplrkFlt001ServiceImpl.java

@@ -64,12 +64,12 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
             }
             //性质默认值
         if(StrUtil.isBlank(flt001.getXz())){
-            flt001.setXz("952751");
+            flt001.setXz("6871");
         }
             //数量=件数*规格
         flt001.setSjjlsl(flt001.getJs()*Double.parseDouble(flt001.getGg()) );
-            //金额=数理*单价
-        flt001.setJe(flt001.getSjjlsl()*flt001.getDj());
+            //金额=件数*单价
+        flt001.setJe(flt001.getJs()*flt001.getDj());
             if (!super.saveOrUpdate(flt001)) { //
                 throw new Exception(flt001.getSjjlspmc()+":保存成品粮入库从表失败");
             }
@@ -88,33 +88,7 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
             //更新通知单
             String ddcbid = flt001.getDdcbid();
             if(!hasBlank(ddcbid)){
-                DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
-                if (byId != null) {
-                    Double wcsl = byId.getWcsl();
-                    Double sysl = byId.getSysl();
-                    if (sysl - sjjlsl < 0) {
-                        jsonObject.set("msg", flt001.getSjjlspmc() + ":入库数量大于订单数量");
-                        throw new RuntimeException(flt001.getSjjlspmc() + ":入库数量大于订单数量");
-//                return jsonObject;
-                    }
-
-                    byId.setWcsl(wcsl + sjjlsl);//订单从表完成数量增加
-                    byId.setSysl(sysl - sjjlsl);//修改订单从平剩余数量
-                    dataCrkywCpltzdxxFlt001Service.updateById(byId);
-                    //更新主表数量
-                    String mainDataId = byId.getMainDataID();
-                    DataCrkywCpltzdxxDefault main = dataCrkywCpltzdxxDefaultService.getById(mainDataId);
-                    if (main != null){
-                        main.setWcsl(main.getWcsl() + sjjlsl);//订单主表完成数量增加
-                        main.setSysl(main.getSysl() - sjjlsl);//订单主表剩余数量
-                        if(main.getSysl()==0){
-                            main.setTsdzt("04");
-                        }else{
-                            main.setTsdzt("03");
-                        }
-                        dataCrkywCpltzdxxDefaultService.updateById(main);
-                    }
-                }
+                dataCrkywCpltzdxxDefaultService.updatePgGopsPlanQuantity(ddcbid,flt001.getSjjlsl(),flt001.getJe(),flt001.getSjjlspmc());
             }
             jsonObject.set("success", true);
             jsonObject.set("msg", "保存成功");
@@ -152,7 +126,9 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
         }
 
         String ddcbid = flt001.getDdcbid();
-        if(!hasBlank(ddcbid)){
+        if(!hasBlank(ddcbid)){ //更新购销计划数量
+            dataCrkywCpltzdxxDefaultService.updatePgGopsPlanQuantity(ddcbid,editZl,0.0,flt001.getSjjlspmc());
+           /*
             DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
             if (byId != null){
                 Double wcsl = byId.getWcsl();
@@ -178,7 +154,7 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
                     }
                     dataCrkywCpltzdxxDefaultService.updateById(main);
                 }
-            }
+            }*/
         }
         jsonObject.set("success", true);
         jsonObject.set("msg", "修改成功");
@@ -217,8 +193,9 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
         }
         String ddcbid = entity.getDdcbid();
         Double sjjlsl = entity.getSjjlsl();
-        if(!hasBlank(ddcbid)){
-            DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
+        if(!hasBlank(ddcbid)){ //更新购销计划数量
+            dataCrkywCpltzdxxDefaultService.updatePgGopsPlanQuantity(ddcbid,sjjlsl*-1,entity.getJe()*-1,entity.getSjjlspmc());
+           /* DataCrkywCpltzdxxFlt001 byId = dataCrkywCpltzdxxFlt001Service.getById(ddcbid);
             if (byId != null){
                 Double wcsl = byId.getWcsl();
                 Double sysl = byId.getSysl();
@@ -238,7 +215,7 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
                     }
                     dataCrkywCpltzdxxDefaultService.updateById(main);
                 }
-            }
+            }*/
         }
         jsonObject.set("success", true);
         jsonObject.set("msg", "删除成功");

src/main/java/com/unis/crk/cplbusiness/service/impl/DataCrkywCpltzdxxDefaultServiceImpl.java

@@ -1,5 +1,6 @@
 package com.unis.crk.cplbusiness.service.impl;
 
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,6 +11,8 @@ import com.unis.crk.business.qcrk.entity.DataCrkywTzdxxDefault;
 import com.unis.crk.business.qcrk.entity.DataCrkywTzdxxFlt001;
 import com.unis.crk.common.service.IDeleteDataRecordService;
 import com.unis.crk.cplbusiness.entity.*;
+import com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanDetailVO;
+import com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanVO;
 import com.unis.crk.cplbusiness.entity.vo.DataCrkywCplpfDefaultVo;
 import com.unis.crk.cplbusiness.entity.vo.DataCrkywCpltzdxxDefaultVo;
 import com.unis.crk.cplbusiness.mapper.DataCrkywCpltzdxxDefaultMapper;
@@ -24,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import sun.rmi.server.WeakClassHashMap;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -266,6 +270,56 @@ public class DataCrkywCpltzdxxDefaultServiceImpl extends ServiceImpl<DataCrkywCp
         return stringObjectHashMap;
     }
 
+    /**
+     * 通过单位Id及作业类型得到库级购销计划下拉列表
+     *
+     * @param unitId   单位id
+     * @param planType 计划类型，1：销售计划；2：收购计划
+     * @returnT
+     */
+    @Override
+    public List<BusinessPgGopsPlanVO> getPgGopsPlanList(String unitId, String planType) {
+        return dataCrkywCpltzdxxDefaultMapper.getPgGopsPlanList(unitId,planType);
+    }
+
+    /**
+     * 库级购销计划详情:通过主表主键Id得到列表
+     *
+     * @param mainDataId 主表主键id
+     */
+    @Override
+    public List<BusinessPgGopsPlanDetailVO> getPgGopsPlanDetailList(String mainDataId) {
+        return dataCrkywCpltzdxxDefaultMapper.getPgGopsPlanDetailList(mainDataId);
+    }
+
+    /**
+     * 库级购销计划:变更主从表完成数量
+     *
+     * @param ddcbid
+     * @return
+     */
+    @Override
+    public boolean updatePgGopsPlanQuantity(String ddcbid,Double sjjlsl,Double sjjlje,String spmc) {
+        BusinessPgGopsPlanDetailVO byId = dataCrkywCpltzdxxDefaultMapper.getPgGopsPlanDetail(ddcbid);
+
+        if (byId != null) {
+            BigDecimal wcsl = byId.getWcsl();
+            BigDecimal sysl = byId.getSysl();
+            BigDecimal sjjlsl_ = NumberUtil.toBigDecimal(sjjlsl);
+            BigDecimal sjjlje_ = NumberUtil.toBigDecimal(sjjlje);
+            if (NumberUtil.sub(sysl,sjjlsl_).doubleValue() < 0.0) {
+                throw new RuntimeException(spmc + ":数量大于购销计划数量");
+//                return jsonObject;
+            }
+            wcsl = NumberUtil.add(wcsl,sjjlsl_); //计算完成数量
+            dataCrkywCpltzdxxDefaultMapper.updatePgGopsPlanDetail(wcsl,byId.getDdcbid());
+            //更新主表数量
+            Integer mainDataId = byId.getPlanId();
+            dataCrkywCpltzdxxDefaultMapper.updatePgGopsPlan(wcsl,sjjlje_,mainDataId);
+        }
+        return true;
+    }
+
 
     @Override
     public List<Map<String,Object>> getCplCrkTzdList(String unitId, String zylx){

src/main/java/com/unis/crk/cplbusiness/service/impl/DataKcglCplkcbdDefaultServiceImpl.java

@@ -128,7 +128,7 @@ public class DataKcglCplkcbdDefaultServiceImpl extends ServiceImpl<DataKcglCplkc
             next.setBdfs(StoreWorkType.KcbdPc.toString());
             //next.setYwsj(new Date());
             if (StrUtil.isBlank(next.getXz())){
-                next.setXz("952751"); //默认值
+                next.setXz("6871"); //默认值
             }
 
                 if(!this.saveOrUpdate(next)){
@@ -227,7 +227,7 @@ public class DataKcglCplkcbdDefaultServiceImpl extends ServiceImpl<DataKcglCplkc
             String yrhwh = next.getYrhwh();
             next.setBdfs(StoreWorkType.KcbdYc.toString());
             if (StrUtil.isBlank(next.getXz())){
-                next.setXz("952751"); //默认值
+                next.setXz("6871"); //默认值
             }
             next.setBdhjs(next.getBdhsl()/Double.parseDouble(next.getGg()));
             //查询调入库存信息，并为调拨数据赋值

src/main/java/com/unis/crk/cplbusiness/service/impl/DataKcglCplqckcDefaultServiceImpl.java

@@ -66,7 +66,7 @@ public class DataKcglCplqckcDefaultServiceImpl extends ServiceImpl<DataKcglCplqc
                 qckc.setEditor(qckc.getUnitid());
             }
             if (StrUtil.isBlank(qckc.getXz())){
-                qckc.setXz("952751"); //默认值
+                qckc.setXz("6871"); //默认值
             }
             //保存数据
             if (!super.saveOrUpdate(qckc)){
@@ -97,7 +97,7 @@ public class DataKcglCplqckcDefaultServiceImpl extends ServiceImpl<DataKcglCplqc
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("success",false);
         if (StrUtil.isBlank(qckc.getXz())){
-            qckc.setXz("952751"); //默认值
+            qckc.setXz("6871"); //默认值
         }
         //保存数据
         if (!super.saveOrUpdate(qckc)){

src/main/java/com/unis/crk/cplbusiness/service/impl/LiAfterSaleServiceImpl.java

@@ -94,7 +94,7 @@ public class LiAfterSaleServiceImpl extends ServiceImpl<LiAfterSaleMapper, LiAft
             dataCrkywCplrkFlt001.setMainDataId(dataid);
             dataCrkywCplrkFlt001.setUnitid(dataCrkywCplrkDefault.getUnitid());
             dataCrkywCplrkFlt001.setDataId(byId.getId());
-            dataCrkywCplrkFlt001.setXz("952751");
+            dataCrkywCplrkFlt001.setXz("6871");
             dataCrkywCplrkFlt001.setUnitid(dataCrkywCplrkDefault.getUnitid());
             dataCrkywCplrkFlt001s.add(dataCrkywCplrkFlt001);
             dataCrkywCplrkDefault.setFltList(dataCrkywCplrkFlt001s);

src/main/java/com/unis/crk/cplbusiness/service/impl/LiOrderServiceImpl.java

@@ -157,7 +157,7 @@ public class LiOrderServiceImpl extends ServiceImpl<LiOrderMapper, LiOrder> impl
                 dataCrkywCplckFlt001.setMainDataId(liOrderItem.getId());
                 dataCrkywCplckFlt001.setDj(liOrderItem.getUnitPrice().doubleValue());
                 dataCrkywCplckFlt001.setUnitid(byId.getUnitid());
-                dataCrkywCplckFlt001.setXz("952751");
+                dataCrkywCplckFlt001.setXz("6871");
                 dataCrkywCplckFlt001s.add(dataCrkywCplckFlt001);
                 dataCrkywCplckDefault.setFltList(dataCrkywCplckFlt001s);
                 dataCrkywCplckDefaults.add(dataCrkywCplckDefault);

src/main/resources/mapper/cplbusiness/DataCrkywCpltzdxxDefaultMapper.xml

@@ -213,5 +213,105 @@
         </if>
         order  by  a.BuildDate desc
     </select>
+    <select id="getPgGopsPlanList" resultType="com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanVO">
+        SELECT
+        a.id as "DataID",
+        GROUP_CONCAT(c.sjjlspmc) as 'mxpzValue',
+        '' as  "kfbh",
+        a.org_id as "orgId",
+        a.updatedate as "ModifyDate",
+        a.plan_code as "tzdbm",
+        a.plan_name as "jhdmc",
+        '' as  "htmc",
+        a.plan_type "cazylx",
+        case WHEN a.plan_type = 1 then  '销售计划' else '收购计划' END as "cazylxmc",
+        a.customer_name as "kfmc",
+        a.plan_quantity as "sl",
+        a.completion_quantity as  "wcsl",
+        a.plan_quantity-a.completion_quantity as "sysl",
+        case WHEN a.plan_type = 1 then  '284344D15DCA72D90AA43C24BD4F9B47' else '420801654D8F01A7D9FCE01B90A395E6' END as "flowId"
+        FROM business_pg_gops_plan a
+        LEFT JOIN business_pg_gops_plan_detail b on a.id = b.pg_gops_plan_id
+        LEFT JOIN data_crkyw_cplsp_default c on b.crkyw_cplsp_default_id = c.dataId
+        WHERE
+        a.org_id = #{unitId}
+        <if test='planType != null and planType != ""'>
+            AND a.plan_type IN (${planType})
+        </if>
+        AND a.plan_quantity-a.completion_quantity > 0
+        GROUP BY a.id
+        ORDER BY a.updatedate DESC
+    </select>
+    <select id="getPgGopsPlanDetailList" resultType="com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanDetailVO">
+         SELECT DISTINCT
+        b.id AS ddcbid,
+        '' AS scnfValue,
+        '' as scnf,
+        '' AS cdValue,
+        '' as  cd,
+        lsxz_enum.enumName AS xzValue,
+        IFNULL(b.grain_nature_id,'6871')as xz,
+        b.unit_price as dj,
+        lspz_enum.enumName AS sjjlpzmc,
+        mxpz_enum.sjjlpzbh as sjjlpzbh,
+        b.quantity*1000 as sl,
+        mxpz_enum.dj as sjjldjbh,
+        lsdj_enum.enumName AS sjjldjmc,
 
+        mxpz_enum.sjjlspmc AS sjjlspmc,
+        mxpz_enum.sjjlspmcbh as sjjlspmcbh,
+        mxpz_enum.sjjlppbh as sjjlppbh,
+        lspp_enum.enumName AS sjjlppmc,
+        b.quantity*1000-b.complete_quantity*1000 as  sysl,
+        b.quantity*1000-b.complete_quantity*1000 as kcsl,
+        (b.quantity*1000-b.complete_quantity*1000)/mxpz_enum.gg as syjs,
+        '' as  ch,
+        mxpz_enum.gg as gg,
+        mxpz_enum.bzq as bzg,
+        mxpz_enum.jldw as jldw,
+        b.updatedate  as "ModifyDate",
+        jldw_enum.enumName AS jldwmc,
+        '1' as taxrate,
+        '' as istax
+        FROM
+         business_pg_gops_plan_detail b
+        LEFT JOIN data_crkyw_cplsp_default mxpz_enum ON mxpz_enum.dataId =b.crkyw_cplsp_default_id
+        LEFT JOIN basic_enum jldw_enum ON jldw_enum.enumId =mxpz_enum.jldw
+        LEFT JOIN basic_enum lsxz_enum ON lsxz_enum.enumId = IFNULL(b.grain_nature_id,'6871')  -- 默认其他商品粮
+        LEFT JOIN basic_enum lspz_enum ON lspz_enum.enumId = mxpz_enum.sjjlpzbh
+        LEFT JOIN basic_enum lsdj_enum ON lsdj_enum.enumId = mxpz_enum.dj
+        LEFT JOIN basic_enum lspp_enum ON lspp_enum.enumId = mxpz_enum.sjjlppbh
+        WHERE
+         b.pg_gops_plan_id = #{mainDataId}
+        and    b.quantity-b.complete_quantity > 0
+        order by b.updatedate desc
+    </select>
+    <select id="getPgGopsPlanDetail" resultType="com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanDetailVO">
+        SELECT DISTINCT
+        b.id AS ddcbid,
+        b.pg_gops_plan_id as planId,
+        b.quantity * 1000 AS sl,
+        b.complete_quantity * 1000 AS wcsl,
+        b.quantity * 1000 - b.complete_quantity * 1000 AS sysl
+    FROM
+        business_pg_gops_plan_detail b
+    where b.id = #{ddcbid}
+    </select>
+    <update id="updatePgGopsPlanDetail">
+        UPDATE business_pg_gops_plan_detail
+        SET updatedate = NOW(),
+            complete_quantity = #{wcsl}
+        WHERE
+	      id=#{ddcbid}
+    </update>
+    <update id="updatePgGopsPlan">
+        UPDATE business_pg_gops_plan
+        SET
+          updatedate = NOW(),
+          completion_amount = completion_amount+#{sjjlje},
+          remaining_amount = remaining_amount-#{sjjlje},
+          completion_quantity = completion_quantity+#{wcsl}
+        WHERE
+	    id = #{mainDataId}
+    </update>
 </mapper>