Merge branch 'master' of crk-java-qinghai/armyfoodSrcQh into dev

crk.iml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="JRebel" name="JRebel">
-      <configuration>
-        <option name="ideModuleStorage">
-          <map>
-            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
-            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
-            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
-            <entry key="jrebelEnabled" value="true" />
-            <entry key="lastExternalPluginCheckTime" value="1715758938450" />
-          </map>
-        </option>
-      </configuration>
-    </facet>
-  </component>
-</module>

src/main/java/com/unis/crk/basic/controller/UserInfoController.java

@@ -317,7 +317,9 @@ public class UserInfoController {
             List<String> roleNames = new ArrayList<>();
             for (UserRole userRole : userRoles) {
                 roleIds.add(userRole.getRoleId());
-                roleNames.add(roleInfoService.getById(userRole.getRoleId()).getRoleName());
+                RoleInfo roleInfo =  roleInfoService.getById(userRole.getRoleId());
+                if (roleInfo != null)
+                roleNames.add(roleInfo.getRoleName());
             }
             userInfoVo.setRoleIds(roleIds);
             userInfoVo.setRoleNames(roleNames);

src/main/java/com/unis/crk/business/qcck/service/impl/DataCrkywCkcmzDefaultServiceImpl.java

@@ -121,7 +121,7 @@ public class DataCrkywCkcmzDefaultServiceImpl extends ServiceImpl<DataCrkywCkcmz
             return jsonObject;
         }
         //更新通知单
-        JSONObject jsonObject2 = dataCrkywTzdxxDefaultService.updateTzdDataQcRk(editZl, matherId,true);
+        JSONObject jsonObject2 = dataCrkywTzdxxDefaultService.updateTzdDataQcRkByDepot(editZl, matherId,true);
         if (!jsonObject2.getBool("success")) {
             jsonObject.set("msg", jsonObject2.getStr("msg"));
             throw new RuntimeException(jsonObject2.getStr("msg"));
@@ -185,7 +185,7 @@ public class DataCrkywCkcmzDefaultServiceImpl extends ServiceImpl<DataCrkywCkcmz
                     throw new RuntimeException("保存仓储数据失败");
                 }
                 //更新通知单
-                JSONObject jsonObject2 = dataCrkywTzdxxDefaultService.updateTzdDataQcRk(editZl, matherId,true);
+                JSONObject jsonObject2 = dataCrkywTzdxxDefaultService.updateTzdDataQcRkByDepot(editZl, matherId,true);
                 if (!jsonObject2.getBool("success")) {
                     jsonObject.set("msg", jsonObject2.getStr("msg"));
                     throw new RuntimeException(jsonObject2.getStr("msg"));
@@ -243,7 +243,7 @@ public class DataCrkywCkcmzDefaultServiceImpl extends ServiceImpl<DataCrkywCkcmz
                 throw new Exception(jsonObject1.get("msg").toString());
             }
             //更新登录通知单
-            jsonObject1 = dataCrkywTzdxxDefaultService.updateTzdDataQcRk(editZl,id,true);
+            jsonObject1 = dataCrkywTzdxxDefaultService.updateTzdDataQcRkByDepot(editZl,id,true);
             if (!jsonObject1.getBool("success")) {
                 jsonObject.set("msg", jsonObject1.getStr("msg"));
                 throw new RuntimeException(jsonObject1.getStr("msg"));

src/main/java/com/unis/crk/business/qcck/service/impl/DataCrkywCkcpzDefaultServiceImpl.java

@@ -98,6 +98,9 @@ public class DataCrkywCkcpzDefaultServiceImpl extends ServiceImpl<DataCrkywCkcpz
             throw  new Exception("保存轨迹表失败");
 //            return  jsonObject;
         }
+        //进行 转圈粮判断
+        bizflowtrailService.circleBusinessInfo(entity.getBizNo(),2);
+
         jsonObject.set("success",true);
         jsonObject.set("msg","保存成功");
         return jsonObject;

src/main/java/com/unis/crk/business/qcrk/service/impl/DataCrkywCpzDefaultServiceImpl.java

@@ -128,7 +128,7 @@ public class DataCrkywCpzDefaultServiceImpl extends ServiceImpl<DataCrkywCpzDefa
             return jsonObject;
         }
         //更新通知单
-        JSONObject jsonObject2 = dataCrkywTzdxxDefaultService.updateTzdDataQcRk(editZl, matherId);
+        JSONObject jsonObject2 = dataCrkywTzdxxDefaultService.updateTzdDataQcRkByDepot(editZl, matherId);
         if (!jsonObject2.getBool("success")) {
             jsonObject.set("msg", jsonObject2.getStr("msg"));
             throw new RuntimeException(jsonObject2.getStr("msg"));
@@ -191,7 +191,7 @@ public class DataCrkywCpzDefaultServiceImpl extends ServiceImpl<DataCrkywCpzDefa
                     throw new RuntimeException("保存仓储数据失败");
                 }
                 //更新通知单
-                JSONObject jsonObject2 = dataCrkywTzdxxDefaultService.updateTzdDataQcRk(editZl, matherId);
+                JSONObject jsonObject2 = dataCrkywTzdxxDefaultService.updateTzdDataQcRkByDepot(editZl, matherId);
                 if (!jsonObject2.getBool("success")) {
                     jsonObject.set("msg", jsonObject2.getStr("msg"));
                     throw new RuntimeException(jsonObject2.getStr("msg"));
@@ -246,8 +246,8 @@ public class DataCrkywCpzDefaultServiceImpl extends ServiceImpl<DataCrkywCpzDefa
                 jsonObject.set("msg", jsonObject1.get("msg").toString());
                 throw new Exception(jsonObject1.get("msg").toString());
             }
-            //更新登录通知单
-            jsonObject1 = dataCrkywTzdxxDefaultService.updateTzdDataQcRk(editZl,id);
+            //更新通知单
+            jsonObject1 = dataCrkywTzdxxDefaultService.updateTzdDataQcRkByDepot(editZl,id);
             if (!jsonObject1.getBool("success")) {
                 jsonObject.set("msg", jsonObject1.getStr("msg"));
                 throw new RuntimeException(jsonObject1.getStr("msg"));

src/main/java/com/unis/crk/business/qcrk/service/impl/DataCrkywQyxxDefaultServiceImpl.java

@@ -68,7 +68,6 @@ public class DataCrkywQyxxDefaultServiceImpl extends ServiceImpl<DataCrkywQyxxDe
     @Transactional(rollbackFor = Exception.class)
     @SystemLog(module = "原粮入库新增签样", methods = "新增",uploadName = "yuliang.rk")
     public JSONObject save(Qcrk qcrk) throws  Exception{
-        {
             JSONObject jsonObject = new JSONObject();
             jsonObject.set("success",false);
             DataCrkywQyxxDefault entity = qcrk.getDataCrkywQyxxDefault();
@@ -94,12 +93,13 @@ public class DataCrkywQyxxDefaultServiceImpl extends ServiceImpl<DataCrkywQyxxDe
                 throw  new Exception("保存汽车扦样失败");
             }
             if (!saveBizflowtrailEnt(qcrk)) { //保存轨迹表
-            throw  new Exception("保存轨迹表失败,检测上一环节[入门登记是否保存]");
-        }
+             throw  new Exception("保存轨迹表失败,检测上一环节[入门登记是否保存]");
+            }
+            //进行 转圈粮判断
+            bizflowtrailService.circleBusinessInfo(entity.getBizNo(),1);
             jsonObject.set("success",true);
             jsonObject.set("msg","保存成功");
             return jsonObject;
-        }
     }
     /**
      *修改汽车入库-扦样表

src/main/java/com/unis/crk/business/qcrk/service/impl/DataCrkywTzdxxDefaultServiceImpl.java

@@ -303,11 +303,12 @@ public class DataCrkywTzdxxDefaultServiceImpl extends ServiceImpl<DataCrkywTzdxx
     }
     @Override
     public List<Map<String,Object>> getTzdList(String unitId, Integer zylx){
-        String flowId = "A7B1FDB54DE7B32D6F8067FEFE2BF52F";
+        String flowId = "420801654D8F01A7D9FCE01B90A395E6";
         if (zylx == 2){ //粮油出库
-            flowId = "6FD0418CD28A2B3F3E7E9EC0D7429461";
+            flowId = "284344D15DCA72D90AA43C24BD4F9B47";
         }
-        return  dataCrkywTzdxxDefaultMapper.getTzdList(unitId,flowId);
+//        return  dataCrkywTzdxxDefaultMapper.getTzdList(unitId,flowId);
+        return  dataCrkywTzdxxDefaultMapper.getTzdListByDepot(unitId,flowId);
     }
     //第二次称重 新增，修改 时将 修改通知单表 剩余数量，如果 称重数据大于 剩余数量 则关闭通知单
     @Override
@@ -379,7 +380,7 @@ public class DataCrkywTzdxxDefaultServiceImpl extends ServiceImpl<DataCrkywTzdxx
             flt001UpdateWrapper.set("UPDATE_TIME",null);
             flt001UpdateWrapper.set("sysl",dir_sy);
             flt001UpdateWrapper.set("wcsl",dir_wc);
-            flt001UpdateWrapper.setSql("UPDATE_TIME=null,wcsl = wcsl-"+editZl+"+"+zl+", sysl = count-wcsl"); //
+            flt001UpdateWrapper.setSql("UPDATE_TIME=null,wcsl = wcsl-"+editZl+", sysl = count-wcsl"); //
             if (!dataCrkywTzdxxFlt001Service.update(flt001UpdateWrapper)) {
                 jsonObject.set("msg", "更新通知单从表剩余数量失败");
                 return jsonObject;
@@ -419,7 +420,7 @@ public class DataCrkywTzdxxDefaultServiceImpl extends ServiceImpl<DataCrkywTzdxx
             Double sl = new Double(list.get(0).get("sl") + ""); //通知单数量
             Double sysl = new Double(list.get(0).get("sysl") + ""); //通知单剩余数量
             Double wcsl = new Double(list.get(0).get("wcsl") + ""); //通知单完成数量
-            String dataId = list.get(0).getOrDefault("dataId","").toString(); //通知单数据Id
+             String dataId = list.get(0).getOrDefault("dataId","").toString(); //通知单数据Id
             String tzdcbid = list.get(0).getOrDefault("tzdcbid","").toString(); //从表通知单数据Id
             if (StrUtil.isBlank(dataId)){ //表示通知单已经不存在
                 jsonObject.set("msg", "通知单["+list.get(0).getOrDefault("tzdh","").toString()+"]不存在");
@@ -430,14 +431,17 @@ public class DataCrkywTzdxxDefaultServiceImpl extends ServiceImpl<DataCrkywTzdxx
             Double dir_sy = sl - dir_wc > 0.0 ? sl - dir_wc : 0.0;
 
             if(sysl-editZl<0){
-                jsonObject.set("msg", "卸载重量大于通知单剩余数量");
+                jsonObject.set("msg", "装卸重量大于通知单剩余数量");
                 return jsonObject;
             }
             //更新库级主从表完成数量与剩余数理
+        dir_sy = dir_sy/1000; //单位吨
+        dir_wc = dir_wc/1000; //单位吨
+        editZl = editZl/1000; //单位吨
         sql = " UPDATE BUSINESS_DELIVERY_STORAGE_NOTICE SET remain_quantity ='" + dir_sy + "',complete_quantity ='" + dir_wc + "' where id = '" + dataId + "'; ";
         //有从表Id，并且是汽车出入库
         if (StringUtils.isNotBlank(tzdcbid)) {
-            sql += "UPDATE BUSINESS_STORE_WARE_DETAIL SET complete_quantity = wcsl+"+editZl+"+"+zl+", remain_quantity = if(in_count >0,in_count,out_count)-complete_quantity where id  ='"+tzdcbid+"'";
+            sql += "UPDATE BUSINESS_STORE_WARE_DETAIL SET complete_quantity = IFNULL(complete_quantity,0)+"+editZl+", remain_quantity = (case when in_count > 0 then in_count ELSE out_count end)-complete_quantity where id  ='"+tzdcbid+"'";
         }
         billnonewgjjMapper.executeUpdate(sql);
 

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

@@ -33,6 +33,24 @@ public class BillnonewController {
 
 
     /**
+     * 得到商品编号
+     * @param unitId 单位id
+     * @return
+     */
+    @ApiOperation(value="查询", notes="得到商品编号")
+    @GetMapping("getScbh/{unitId}")
+    public ResultUtil getScbh(@PathVariable("unitId") String unitId){
+        LOGGER.info("入参为:{}",unitId);
+        ResultUtil data = new ResultUtil();
+        if (StringUtils.isEmpty(unitId)){
+            data.failed("传入的单位id为空");
+            return data;
+        }
+        data.success(this.billnonewService.getScbh(unitId));
+        return data;
+    }
+
+    /**
      * 得到生产批号
      * @param unitId 单位id
      * @param spbh 商品编号

src/main/java/com/unis/crk/common/mapper/BizflowtrailMapper.java

@@ -2,6 +2,10 @@ package com.unis.crk.common.mapper;
 
 import com.unis.crk.common.entity.Bizflowtrail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +16,28 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-09-28
  */
 public interface BizflowtrailMapper extends BaseMapper<Bizflowtrail> {
+    /**
+     * 根据方向查询单位，品种，车牌号及业务日期
+     * @param bizNo
+     * @param direction
+     * @return
+     */
+    Map<String,Object> getCrkPzInfo(@Param("bizNo") String bizNo, @Param("direction") Integer direction);
 
+    /**
+     * 得到转圈粮信息
+     * @param unitId
+     * @param lspz
+     * @param beginDay
+     * @param endDay
+     * @param cph
+     * @param direction
+     * @return
+     */
+    Map<String,Object> getCircleBusinessInfo(@Param("unitId")String unitId,
+                                             @Param("lspz")String lspz,
+                                             @Param("beginDay")String beginDay,
+                                             @Param("endDay")String endDay,
+                                             @Param("cph")String cph,
+                                             @Param("direction") Integer direction);
 }

src/main/java/com/unis/crk/common/service/IBillnonewService.java

@@ -188,4 +188,12 @@ public interface IBillnonewService extends IService<Billnonew> {
     String getFjDh(String unitId);
 
     String getScpcbySp(String unitId, String spbh, String scrq,String scpc);
+
+    /**
+     *
+     * 得到商品编号
+     * @param unitId
+     * @return
+     */
+    String getScbh(String unitId);
 }

src/main/java/com/unis/crk/common/service/IBizflowtrailService.java

@@ -1,5 +1,6 @@
 package com.unis.crk.common.service;
 
+import cn.hutool.json.JSONObject;
 import com.unis.crk.common.entity.Bizflowtrail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBizflowtrailService extends IService<Bizflowtrail> {
 
+    /**
+     *查询转圈粮
+     * @param bizNo 单据号
+     * @param direction 方向：1;入库，2;出库
+     * @return
+     */
+    JSONObject circleBusinessInfo(String bizNo, int direction);
+
 }

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

@@ -254,6 +254,17 @@ public class BillnonewServiceImpl extends ServiceImpl<BillnonewMapper, Billnonew
         return spbh+date+"_"+gys;
     }
 
+    /**
+     * 得到商品编号
+     *
+     * @param unitId
+     * @return
+     */
+    @Override
+    public String getScbh(String unitId) {
+        return  createNewNo("SP_",unitId,"data_crkyw_cplsp_default","sjjlspmcbh",6);
+    }
+
     @Override
     public String getCpljsBizNo(String unitId) {
         return createNewNo("",unitId,"settlement_management","js",3);

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

@@ -1,11 +1,22 @@
 package com.unis.crk.common.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONObject;
 import com.unis.crk.common.entity.Bizflowtrail;
+import com.unis.crk.common.mapper.BillnonewgjjMapper;
 import com.unis.crk.common.mapper.BizflowtrailMapper;
 import com.unis.crk.common.service.IBizflowtrailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.unis.crk.utils.SqpMapUtil;
+import lombok.experimental.var;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.Dictionary;
+import java.util.Map;
+
 /**
  * <p>
  * 数据流程节点轨迹记录表 服务实现类
@@ -17,5 +28,55 @@ import org.springframework.stereotype.Service;
 @Service
 public class BizflowtrailServiceImpl extends ServiceImpl<BizflowtrailMapper, Bizflowtrail> implements IBizflowtrailService {
 
+    @Resource
+    private BizflowtrailMapper bizflowtrailMapper;
+    @Resource
+    private BillnonewgjjMapper billnonewgjjMapper;
+
+    /**
+     * 查询转圈粮
+     *
+     * @param bizNo     单据号
+     * @param direction 方向：1;入库，2;出库
+     * @return
+     */
+    @Override
+    public JSONObject circleBusinessInfo(String bizNo, int direction) {
+        try {
 
+            //根据方向查询单位，品种，车牌号及业务日期
+            Map<String,Object> map = bizflowtrailMapper.getCrkPzInfo(bizNo,direction);
+            if (map != null){
+                String unitId = map.getOrDefault("unitId","").toString(); //单位id
+                String lspz = map.getOrDefault("lspz","").toString(); //品种id
+                String lspzName = map.getOrDefault("lspzName","").toString(); //品种id
+                String orgName = map.getOrDefault("orgName","").toString(); // 单位名称
+                String ywrq = map.getOrDefault("ywrq","").toString(); // 业务日期
+                String slr = map.getOrDefault("slr","").toString(); // 客户名称
+                String cph = map.getOrDefault("cph","").toString(); // 车牌号
+            //得到最近三天内出入库情况
+                int DayCount=3;//3天内
+                String dateFormat = "yyyy-MM-dd";
+                Date ywrq_ = DateUtil.parse(ywrq,dateFormat);
+                String beginDay=DateUtil.offsetDay(ywrq_,DayCount*-1).toString(dateFormat); //开始日期,前三天
+                String endDay=ywrq; //结束日期
+                Map<String,Object> map1 =bizflowtrailMapper.getCircleBusinessInfo(unitId,lspz,beginDay,endDay,cph,direction);
+                if (map1 != null){ //表示有转圈粮的可能性
+                    String ywrq_1 = map1.getOrDefault("ywrq","").toString(); // 业务日期
+                    String cfmc = map1.getOrDefault("cfmc","").toString(); // 仓库名称
+                    String sl = map1.getOrDefault("sl","").toString(); // 数量
+                    String lsdjName = map1.getOrDefault("lsdjName","").toString(); // 等级名称
+                    //写一条预警信息到库级的转圈粮预警信息表中
+                    String detail="注意：车牌号【"+cph+"】车辆，"+ywrq_1+"日存在“"+orgName+"”"+
+                            cfmc+((direction==1)?"出":"入")+"库记录，粮食品种："+lspzName+"、粮食数量："+sl+"kg、粮食等级："+lsdjName+"。"+
+                            "系统自动判断疑为转圈粮！";
+                    String addSql = String.format(SqpMapUtil.getSql("INSERT_STORAGEPREVIOLATION"), slr,orgName,detail,unitId);
+                    billnonewgjjMapper.executeUpdate(addSql);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

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

@@ -207,5 +207,22 @@ public class DataCrkywCplspDefaultController {
         return data.success(datas);
 
     }
+
+
+    /**
+     * shine
+     * 生成商品编号
+     */
+    @ApiOperation(value="*生成商品编号", notes="生成商品编号 orgId+Sp_6位顺序号")
+    @GetMapping("getSpbhByOrgId/{orgId}")
+    public String getSpbhByOrgId(@PathVariable("orgId") String orgId){
+        LOGGER.info("入参为:{}",orgId);
+        ResultUtil<DataCrkywCplspDefault> data = new ResultUtil<>();
+        if (StringUtils.isEmpty(orgId)){
+            data.failed("传入的单位id为空");
+            return "0";
+        }
+        return this.dataCrkywCplspDefaultService.getSpbhByOrgId(orgId);
+    }
 }
 

src/main/java/com/unis/crk/cplbusiness/entity/DataCrkywCplckFlt001.java

@@ -73,6 +73,18 @@ private static final long serialVersionUID=1L;
     @TableField("deptId")
     private String deptId;
 
+    @ApiModelProperty(value = "仓房id")
+    private String ch;
+
+    @ApiModelProperty(value = "货位id")
+    private String hwh;
+
+    @ApiModelProperty(value = "仓房名称")
+    private String chmc;
+
+    @ApiModelProperty(value = "货位名称")
+    private String hwmc;
+
     @ApiModelProperty(value = "实际军粮品种名称")
     private String sjjlpzmc;
 
@@ -144,4 +156,16 @@ private static final long serialVersionUID=1L;
 
     @ApiModelProperty(value = "税率")
     private Double taxrate;
+
+    @ApiModelProperty(value = "回显数量")
+    @TableField(exist = false)
+    private Double sl;
+
+    @ApiModelProperty(value = "回显件数")
+    @TableField(exist = false)
+    private Double tzdJs;
+
+    @ApiModelProperty(value = "回显剩余数量")
+    @TableField(exist = false)
+    private Double sysl;
 }

src/main/java/com/unis/crk/cplbusiness/entity/DataCrkywCplrkFlt001.java

@@ -72,6 +72,19 @@ private static final long serialVersionUID=1L;
     @TableField("deptId")
     private String deptId;
 
+    @ApiModelProperty(value = "仓房id")
+    private String ch;
+
+    @ApiModelProperty(value = "货位id")
+    private String hwh;
+
+    @ApiModelProperty(value = "仓房名称")
+    private String chmc;
+
+    @ApiModelProperty(value = "货位名称")
+    private String hwmc;
+
+
     @ApiModelProperty(value = "实际军粮品种名称")
     private String sjjlpzmc;
 
@@ -148,4 +161,16 @@ private static final long serialVersionUID=1L;
 
     @ApiModelProperty(value = "税率")
     private Double taxrate;
+
+    @ApiModelProperty(value = "回显数量")
+    @TableField(exist = false)
+    private Double sl;
+
+    @ApiModelProperty(value = "回显件数")
+    @TableField(exist = false)
+    private Double tzdJs;
+
+    @ApiModelProperty(value = "回显剩余数量")
+    @TableField(exist = false)
+    private Double sysl;
 }

src/main/java/com/unis/crk/cplbusiness/entity/DataCrkywCplspDefault.java

@@ -32,10 +32,10 @@ private static final long serialVersionUID=1L;
     @TableId(value = "dataId", type = IdType.UUID)
     private String dataId;
 
-    @ApiModelProperty(value = "单位ID")
+    @ApiModelProperty(value = "*单位ID")
     private String unitid;
 
-    @ApiModelProperty(value = "创建人")
+    @ApiModelProperty(value = "*创建人")
     private String builder;
 
 
@@ -58,38 +58,38 @@ private static final long serialVersionUID=1L;
     @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
     private Date scrq;
 
-    @ApiModelProperty(value = "保质期")
+    @ApiModelProperty(value = "*保质期")
     private String bzq;
 
     @ApiModelProperty(value = "部门id")
     @TableField("deptId")
     private String deptId;
 
-    @ApiModelProperty(value = "实际军粮品种名称")
+    @ApiModelProperty(value = "*实际军粮品种名称")
     private String sjjlpzmc;
 
-    @ApiModelProperty(value = "实际军粮品种编号")
+    @ApiModelProperty(value = "*实际军粮品种编号")
     private String sjjlpzbh;
 
-    @ApiModelProperty(value = "实际军粮品牌名称")
+    @ApiModelProperty(value = "*实际军粮品牌名称")
     private String sjjlppmc;
 
-    @ApiModelProperty(value = "实际军粮品牌编号")
+    @ApiModelProperty(value = "*实际军粮品牌编号")
     private String sjjlppbh;
 
-    @ApiModelProperty(value = "实际军粮商品名称")
+    @ApiModelProperty(value = "*实际军粮商品名称")
     private String sjjlspmc;
 
-    @ApiModelProperty(value = "实际军粮商品名称编号")
+    @ApiModelProperty(value = "*实际军粮商品名称编号")
     private String sjjlspmcbh;
 
     @ApiModelProperty(value = "生产批次")
     private String scpc;
 
-    @ApiModelProperty(value = "规格")
+    @ApiModelProperty(value = "*规格")
     private String gg;
 
-    @ApiModelProperty(value = "计量单位")
+    @ApiModelProperty(value = "*计量单位")
     private String jldw;
 
     @ApiModelProperty(value = "提前预警天数")
@@ -108,7 +108,7 @@ private static final long serialVersionUID=1L;
     private String sccsbh;
 
 
-    @ApiModelProperty(value = "等级")
+    @ApiModelProperty(value = "*等级")
     private String dj;
     @ApiModelProperty(value = "是否启用1启用2禁用")
     @TableField(value = "isenable")
@@ -119,7 +119,7 @@ private static final long serialVersionUID=1L;
     private String zgcs;
     @ApiModelProperty(value = "是否为统筹采购商品")
     private String tccg;
-    @ApiModelProperty(value = "备注")
+    @ApiModelProperty(value = "*备注")
     private String bz;
 
 }

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

@@ -1,10 +1,11 @@
 package com.unis.crk.cplbusiness.entity.result;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -14,8 +15,10 @@ import java.util.Date;
  * @author TS
  * @date  2024/07/08 15:42
  **/
-@Getter
-@Setter
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="BusinessPgGopsPlanDetailVO对象", description="成品粮监管-购销计划管理-明细表实体")
 public class BusinessPgGopsPlanDetailVO {
 
     /** 明细记录唯一标识符 */

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

@@ -1,9 +1,13 @@
 package com.unis.crk.cplbusiness.entity.result;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -15,13 +19,15 @@ import java.util.List;
  * @author TS
  * @date  2024/07/08 15:41
  **/
-@Getter
-@Setter
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="BusinessPgGopsPlanVO对象", description="成品粮监管-购销计划管理表实体")
 public class BusinessPgGopsPlanVO {
 
     /** 主键ID */
-    @ApiModelProperty(value = "主键ID", position = 1)
-    private String DataID;
+    @ApiModelProperty(value = "计划id", position = 1)
+    private String ddid;
 
 
     /** 更新日期 */
@@ -35,7 +41,7 @@ public class BusinessPgGopsPlanVO {
 
     /** 计划编号 */
     @ApiModelProperty(value = "计划编号", position = 4)
-    private String tzdbm;
+    private String ddbh;
 
     /** 计划名称 */
     @ApiModelProperty(value = "计划名称", position = 5)
@@ -79,5 +85,9 @@ public class BusinessPgGopsPlanVO {
     @ApiModelProperty(value = "商品名称", position = 15)
     private String mxpzValue;
 
+    /** 品牌名称 */
+    @ApiModelProperty(value = "品牌名称", position = 16)
+    private String ppValue;
+
 
 }

src/main/java/com/unis/crk/cplbusiness/entity/vo/DataCrkywCplspDefaultVo.java

@@ -27,4 +27,10 @@ public class DataCrkywCplspDefaultVo {
     @ApiModelProperty(value = "规格")
     String gg;
 
+    @ApiModelProperty(value = "实际军粮商品名称编号")
+    String sjjlspmcbh;
+
+    @ApiModelProperty(value = "业务时间")
+    String cjsj;
+
 }

src/main/java/com/unis/crk/cplbusiness/entity/vo/DataKcglCplqckcDefaultVo.java

@@ -24,6 +24,10 @@ public class DataKcglCplqckcDefaultVo {
     String sjjlpzbh;
     @ApiModelProperty(value = "商品名称")
     String sjjlspmc;
+    @ApiModelProperty(value = "仓房名称")
+    String chmc;
+    @ApiModelProperty(value = "货位名称")
+    String hwmc;
     @ApiModelProperty(value = "规格")
     String gg;
     @ApiModelProperty(value = "业务时间开始")

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

@@ -65,4 +65,6 @@ public interface IDataCrkywCplspDefaultService extends IService<DataCrkywCplspDe
         List<DataCrkywCplspDefault> getBySpbhs(List<String> spbhs);
 
         List<Map<String,Object>> getCplSpListbydd(String ddId);
+
+        String getSpbhByOrgId(String orgId);
 }

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

@@ -10,6 +10,7 @@ import com.unis.crk.business.kcgl.entity.DataKcglFcbgzDefault;
 import com.unis.crk.business.qcck.entity.DataCrkywCkcmzDefault;
 import com.unis.crk.business.qcck.entity.DataCrkywCkcpzDefault;
 import com.unis.crk.common.entity.Bizflowtrail;
+import com.unis.crk.common.service.IBillnonewService;
 import com.unis.crk.common.service.IDeleteDataRecordService;
 import com.unis.crk.cplbusiness.entity.*;
 import com.unis.crk.cplbusiness.mapper.DataCrkywCplckDefaultMapper;
@@ -66,7 +67,8 @@ public class DataCrkywCplckDefaultServiceImpl extends ServiceImpl<DataCrkywCplck
     private IDispatchEhicleManagementService dispatchEhicleManagementService;
     @Autowired
     private IDispatcPersonnelManagementService dispatcPersonnelManagementService;
-
+    @Autowired
+    private IBillnonewService billnonewService;
 
 
     /**
@@ -141,13 +143,16 @@ public class DataCrkywCplckDefaultServiceImpl extends ServiceImpl<DataCrkywCplck
             throw new Exception("保存成品粮出库失败");
         }
         String spmc = "";
-                    if("0".equals(param.getIsstaging())){ //
+       if("0".equals(param.getIsstaging())){ //
                 for (int i = 0; i < flt001s.size(); i++) {
                     //保存从表数据，有错误抛异常
                     DataCrkywCplckFlt001 flt001 = flt001s.get(i);
                     flt001.setMainDataId(dataId);// 设置主表ID
                     flt001.setUnitid(unitId);// 设置单位id
                     flt001.setIsstaging("0");//设置暂存
+                    //得到生产批次
+                    String scpc = billnonewService.getScpc(unitId,flt001.getSjjlspmcbh(),DateUtil.format(flt001.getScrq(),"yyyy-MM-dd"),"");
+                    flt001.setScpc(scpc);
                     dataCrkywCplckFlt001Service.save(flt001);
                     spmc +=flt001.getSjjlspmc()+",";
                 }
@@ -164,6 +169,9 @@ public class DataCrkywCplckDefaultServiceImpl extends ServiceImpl<DataCrkywCplck
                     flt001.setMainDataId(dataId);// 设置主表ID
                     flt001.setUnitid(unitId);// 设置单位id
                     flt001.setIsstaging("1");//设置保存
+                    //得到生产批次
+                    String scpc = billnonewService.getScpc(unitId,flt001.getSjjlspmcbh(),DateUtil.format(flt001.getScrq(),"yyyy-MM-dd"),"");
+                    flt001.setScpc(scpc);
                     dataCrkywCplckFlt001Service.saveFlt(flt001);
 
                     spmc +=flt001.getSjjlspmc()+",";
@@ -321,8 +329,11 @@ public class DataCrkywCplckDefaultServiceImpl extends ServiceImpl<DataCrkywCplck
                 flt001.setMainDataId(dataId);// 设置主表ID
                 flt001.setUnitid(unitId);// 设置单位id
                 flt001.setIsstaging("1");//设置保存
+                //得到生产批次
+                String scpc = billnonewService.getScpc(unitId,flt001.getSjjlspmcbh(),DateUtil.format(flt001.getScrq(),"yyyy-MM-dd"),"");
+                flt001.setScpc(scpc);
                 spmc +=flt001.getSjjlspmc()+",";
-                dataCrkywCplckFlt001Service.saveFlt(flt001);
+                dataCrkywCplckFlt001Service.save(flt001);
 
                 spmc +=flt001.getSjjlspmc()+",";
             }
@@ -343,6 +354,9 @@ public class DataCrkywCplckDefaultServiceImpl extends ServiceImpl<DataCrkywCplck
                         DataCrkywCplckFlt001 flt001 = insertFlt.get(j);
                         flt001.setMainDataId(param.getDataId());// 设置主表
                         flt001.setUnitid(param.getUnitid());//
+                        //得到生产批次
+                        String scpc = billnonewService.getScpc(unitId,flt001.getSjjlspmcbh(),DateUtil.format(flt001.getScrq(),"yyyy-MM-dd"),"");
+                        flt001.setScpc(scpc);
                         dataCrkywCplckFlt001Service.saveFlt(flt001);
                     }
                 }

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

@@ -330,14 +330,13 @@ public class DataCrkywCplckFlt001ServiceImpl extends ServiceImpl<DataCrkywCplckF
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("success", false);
         DataCrkywCplckFlt001 flt001  = super.getById(dataId);
-        DataCrkywCplckDefault dataCrkywCplckDefault  = dataCrkywCplckDefaultService.getById(flt001.getMainDataId());
         String sjjlpzbh = flt001.getSjjlpzbh();//品种编号
         String sjjlppbh = flt001.getSjjlppbh();//品牌编号
         String sjjlspmcbh = flt001.getSjjlspmcbh();//商品名称编号
         String scpc = flt001.getScpc();//生产批次
         String xz = flt001.getXz();//性质
-        String ch = dataCrkywCplckDefault.getCh();//仓房
-        String hw = dataCrkywCplckDefault.getHwh();//货位
+        String ch = flt001.getCh();//仓房
+        String hw = flt001.getHwh();//货位
         String gg = flt001.getGg();//规格
         String jldw = flt001.getJldw();//计量单位
 

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

@@ -1,5 +1,6 @@
 package com.unis.crk.cplbusiness.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
@@ -113,6 +114,9 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
             DataCrkywCplrkFlt001 flt001 = flt001s.get(i);
             flt001.setMainDataId(dataId);// 设置主表ID
             flt001.setUnitid(unitId);// 设置单位id
+            //得到生产批次
+            String scpc = billnonewService.getScpc(unitId,flt001.getSjjlspmcbh(),DateUtil.format(flt001.getScrq(),"yyyy-MM-dd"),"");
+            flt001.setScpc(scpc);
             //青海无溯源业务
 //            SysParams byId = sysParamsService.getById("sy.url");
 //            String paramVal = byId.getParamVal();
@@ -123,7 +127,7 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
                 spmc += flt001.getSjjlspmc() + ",";
                 flt001.setIsstaging("1");
                 //有订单时，自动新增评分数据
-                if (StrUtil.isNotBlank(param.getDdbh())) {
+//                if (StrUtil.isNotBlank(param.getDdbh())) {
                     //青海无此业务
 //                    DataCrkywCplpfDefault dataCrkywCplpfDefault = new DataCrkywCplpfDefault();
 //                    dataCrkywCplpfDefault.setScpc(flt001.getScpc());
@@ -134,8 +138,8 @@ public class DataCrkywCplrkDefaultServiceImpl extends ServiceImpl<DataCrkywCplrk
 //                    dataCrkywCplpfDefault.setRkbh(param.getRkbh());
 //                    dataCrkywCplpfDefault.setRksj(param.getYwsj());
 //                    dataCrkywCplpfDefaultService.save(dataCrkywCplpfDefault);
-                    dataCrkywCplrkFlt001Service.saveFlt(flt001);
-                }
+//                }
+                dataCrkywCplrkFlt001Service.saveFlt(flt001);
             }else{ //暂存只保存数据，不涉及业务
                 flt001.setIsstaging("0");
                 dataCrkywCplrkFlt001Service.save(flt001);

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

@@ -45,7 +45,7 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
     private IDataCrkywCpltzdxxDefaultService dataCrkywCpltzdxxDefaultService;
 
     @Override
-    @SystemLog(module = "成品通知单", methods = "修改",uploadName = "cpl.tzd")
+    @SystemLog(module = "成品入库", methods = "新增",uploadName = "cpl.rk")
     public JSONObject saveFlt(DataCrkywCplrkFlt001 flt001) throws Exception {
             JSONObject jsonObject = new JSONObject();
             jsonObject.set("success", false);
@@ -96,7 +96,7 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
     }
 
     @Override
-    @SystemLog(module = "成品通知单", methods = "修改",uploadName = "cpl.tzd")
+    @SystemLog(module = "成品入库", methods = "修改",uploadName = "cpl.rk")
     public JSONObject updateFlt(DataCrkywCplrkFlt001 flt001) throws Exception {
         //保存库存相关数据
         JSONObject jsonObject = new JSONObject();
@@ -162,7 +162,7 @@ public class DataCrkywCplrkFlt001ServiceImpl extends ServiceImpl<DataCrkywCplrkF
     }
 
     @Override
-    @SystemLog(module = "成品通知单", methods = "修改",uploadName = "cpl.tzd")
+    @SystemLog(module = "成品入库", methods = "删除",uploadName = "cpl.rk")
     public JSONObject deleteFlt(String id) throws Exception {
         JSONObject jsonObject = new JSONObject();
         jsonObject.set("success", false);

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

@@ -111,6 +111,12 @@ public class DataCrkywCplspDefaultServiceImpl extends ServiceImpl<DataCrkywCplsp
         if (StringUtils.isNotBlank(pageQuery.getSjjlspmc())){
             queryWrapper.like("a.sjjlspmc", ResultUtil.getQueryWrapperformat(pageQuery.getSjjlspmc()));
         }
+        if (StringUtils.isNotBlank(pageQuery.getSjjlspmcbh())){
+            queryWrapper.eq("a.sjjlspmcbh", pageQuery.getSjjlspmcbh());
+        }
+        if (StringUtils.isNotBlank(pageQuery.getCjsj())){
+            queryWrapper.eq("a.cjsj", pageQuery.getCjsj());
+        }
         queryWrapper.orderByDesc("cjsj");
         //分页相关
         Page<DataCrkywCplspDefault> p =new Page<>(pageQuery.getPage(),pageQuery.getLimit());
@@ -169,5 +175,66 @@ public class DataCrkywCplspDefaultServiceImpl extends ServiceImpl<DataCrkywCplsp
         }
     }
 
+    @Override
+    public String getSpbhByOrgId(String orgId) {
+        QueryWrapper<DataCrkywCplspDefault> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(DataCrkywCplspDefault::getUnitid,orgId);
+        queryWrapper.lambda().orderByDesc(DataCrkywCplspDefault::getSjjlspmcbh);
+        List<DataCrkywCplspDefault> list= this.list(queryWrapper);
+        if(list.size()>0){
+            return this.SpbhByOrgId(orgId+"SP_",6,list.get(0).getSjjlspmcbh());
+        }else{
+            return orgId+"SP_"+""+""+"000001";
+        }
+    }
+
+    /**
+     * 编号生成
+     * @param f 前缀
+     * @param length 位数必须大于0
+     * @param xh 字符串
+     * @return 尾数+1的编号
+     */
+    public  String SpbhByOrgId(String f, int length, String xh) {
+        // 初始化
+        int num = 1;
+        if (!com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(xh)) {
+            String substring = xh.substring(xh.length() - length);
+            int i = Integer.parseInt(substring);
+            if (i < maxNum(length)) {
+                num += i;
+            }
+        }
+        return f+""+integerToString(length, num);
+    }
+
+    /**
+     * 获取int位数的最大值:如6位->999999
+     * @param length int位数
+     * @return int
+     */
+    private  int maxNum(int length) {
+        if (0 < length) {
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < length; i++) {
+                builder.append(9);
+            }
+            return Integer.parseInt(builder.toString());
+        }
+        return 0;
+    }
+
+    /**
+     * int 定长拼接-后缀顺序号
+     *
+     * @param length 总长度
+     * @param param  参数
+     * @return 参数前补0
+     */
+    private  String integerToString(int length, int param) {
+        System.out.println(String.format("%0" + length + "d", param));
+        return String.format("%0" + length + "d", param);
+    }
+
 
 }

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

@@ -311,11 +311,13 @@ public class DataCrkywCpltzdxxDefaultServiceImpl extends ServiceImpl<DataCrkywCp
                 throw new RuntimeException(spmc + ":数量大于购销计划数量");
 //                return jsonObject;
             }
-            wcsl = NumberUtil.add(wcsl,sjjlsl_); //计算完成数量
+            wcsl = NumberUtil.div(NumberUtil.add(wcsl,sjjlsl_),1000); //计算完成数量,单位吨
             dataCrkywCpltzdxxDefaultMapper.updatePgGopsPlanDetail(wcsl,byId.getDdcbid());
             //更新主表数量
             Integer mainDataId = byId.getPlanId();
-            dataCrkywCpltzdxxDefaultMapper.updatePgGopsPlan(wcsl,sjjlje_,mainDataId);
+            sjjlje_ = NumberUtil.div(sjjlje_,1000); //单位万元
+            sjjlsl_ = NumberUtil.div(sjjlsl_,1000); //单位吨
+            dataCrkywCpltzdxxDefaultMapper.updatePgGopsPlan(sjjlsl_,sjjlje_,mainDataId);
         }
         return true;
     }

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

@@ -1,5 +1,6 @@
 package com.unis.crk.cplbusiness.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.unis.crk.aop.SystemLog;
 import com.unis.crk.business.kcgl.entity.DataKcglFcbgzDefault;
 import com.unis.crk.business.kcgl.entity.DataKcglQckcDefault;
+import com.unis.crk.common.service.IBillnonewService;
 import com.unis.crk.common.service.IDeleteDataRecordService;
 import com.unis.crk.cplbusiness.entity.DataKcglCplfcbgzDefault;
 import com.unis.crk.cplbusiness.entity.DataKcglCplqckcDefault;
@@ -50,6 +51,8 @@ public class DataKcglCplqckcDefaultServiceImpl extends ServiceImpl<DataKcglCplqc
     private IDataKcglCplfcbgzDefaultService dataKcglCplfcbgzDefaultService;
     @Autowired
     private IDeleteDataRecordService deleteDataRecordService;
+    @Autowired
+    private IBillnonewService billnonewService;
     /**
      *保存成品粮期初
      * @param qckc 成品粮期初业务数据
@@ -68,6 +71,9 @@ public class DataKcglCplqckcDefaultServiceImpl extends ServiceImpl<DataKcglCplqc
             if (StrUtil.isBlank(qckc.getXz())){
                 qckc.setXz("6871"); //默认值
             }
+            //得到生产批次
+            String scpc = billnonewService.getScpc(qckc.getUnitid(),qckc.getSjjlspmcbh(),DateUtil.format(qckc.getScrq(),"yyyy-MM-dd"),"");
+            qckc.setScpc(scpc);
             //保存数据
             if (!super.saveOrUpdate(qckc)){
                 throw new RuntimeException("保存成品粮期初库存失败");
@@ -174,11 +180,17 @@ public class DataKcglCplqckcDefaultServiceImpl extends ServiceImpl<DataKcglCplqc
         if(StringUtils.isNotBlank(pageQuery.getSjjlspmc())){
             queryWrapper.like("a.sjjlspmc", ResultUtil.getQueryWrapperformat(pageQuery.getSjjlspmc()));
         }
+        if(StringUtils.isNotBlank(pageQuery.getChmc())){
+            queryWrapper.like("st.storehouse_name", ResultUtil.getQueryWrapperformat(pageQuery.getChmc()));
+        }
+        if(StringUtils.isNotBlank(pageQuery.getHwmc())){
+            queryWrapper.like("wa.warehouse_name", ResultUtil.getQueryWrapperformat(pageQuery.getHwmc()));
+        }
         if (StringUtils.isNotBlank(pageQuery.getJysjStart()) && StringUtils.isNotBlank(pageQuery.getJysjEnd())){
-            queryWrapper.apply(" DATE_FORMAT(ifnull(a.rq,NOW()),'%Y-%m-%d') >=  '"+pageQuery.getJysjStart()+"' AND DATE_FORMAT(ifnull(a.rq,NOW()),'%Y-%m-%d') <= '"+pageQuery.getJysjEnd()+" 23:59:59'");
+            queryWrapper.apply(" DATE_FORMAT(ifnull(a.cjsj,NOW()),'%Y-%m-%d') >=  '"+pageQuery.getJysjStart()+"' AND DATE_FORMAT(ifnull(a.cjsj,NOW()),'%Y-%m-%d') <= '"+pageQuery.getJysjEnd()+" 23:59:59'");
 
         }
-        queryWrapper.orderByDesc("a.rq");
+        queryWrapper.orderByDesc("a.cjsj");
         //分页相关
         Page<DataKcglCplqckcDefault> p =new Page<>(pageQuery.getPage(),pageQuery.getLimit());
 

src/main/resources/SqlMap/sql.xml

@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
+	<sql id="INSERT_STORAGEPREVIOLATION">
+		<!--插入转圈粮预警信息-->
+		INSERT INTO storage_pre_violation (
+		publish_time,
+		offender,
+		library_point_name,
+		violation_type,
+		detail,
+		subject_type,
+		STATUS,
+		org_id,
+		create_time
+		)
+		VALUES
+		(
+		NOW(),
+		'%s',
+		'%s',
+		1,
+		'%s',
+		NULL,
+		0,
+		%s,
+		NOW()
+		);
+	</sql>
 	<!-- 插入入库月结单第一笔数据 -->
 	<sql id="ADD_YJD">
 		insert into data_kcgl_kcyjd_default (

src/main/resources/mapper/business/kcgl/DataKcglXckcDefaultMapper.xml

@@ -193,26 +193,26 @@ INSERT INTO data_kcgl_xckc_default(
 			D.BIZNO,							-- 7、
 			D.SHOWORDER,								-- 8、
 			A.jhdbh,							-- 9、计划单号
-			B.htbh,							-- 10、合同编号
-			IFNULL(A.mxpz,B.mxpz),	-- 11、明细品种
+			a.htbh,							-- 10、合同编号
+			A.mxpz,	-- 11、明细品种
 			E.org_name,						-- 12、单位名称
 			A.cph,							-- 13、车牌号码
 			E.Org_Code,						-- 14 单位编码（组织机构码）
 			'',							-- 15、质检单号
 			'',								-- 16、存放设施类型
-			F.price,							-- 17、单价
-			F.price*D.klhjz,			-- 18、单价*卸载后净重
+			0,							-- 17、单价
+			0*D.klhjz,			-- 18、单价*卸载后净重
 			A.lspz,							-- 19、粮食品种
 			D.jmsj,						-- 20、
 			F.grain_producing_area,							-- 21、产地
 			D.sjckch,							-- 22、实际仓房
 			'',								-- 23、售粮人身份证号
-			F.grain_grade,							-- 24、粮食等级
+			a.lydj,							-- 24、粮食等级
 			D.klhjz,						-- 25、卸载后净重
-			IFNULL(A.lyxz,B.lsxz),	-- 26、货物性质
+			A.lyxz,	-- 26、货物性质
 			D.sjhwh,							-- 27、实际货位
 			'',									-- 28、联系地址
-			F.grain_annual,									-- 29、生产年份
+			scnf.enumId,									-- 29、生产年份
 			A.cyrdh,						-- 30、承运人电话
 			A.cyr,						-- 31、承运人姓名
 			A.cllx,							-- 32、车辆类型
@@ -223,15 +223,14 @@ INSERT INTO data_kcgl_xckc_default(
 			D.mz-cp.pz,						-- 37
 			D.DeptID
 		FROM data_crkyw_ckrmdj_default A 				-- 出库入门登记表
-			INNER JOIN data_crkyw_ckcmz_default D		-- 出库称毛重
-				ON A.BIZNO=D.BIZNO
-			INNER JOIN data_crkyw_ckcpz_default cp
-				ON D.BIZNO=cp.BIZNO
-			INNER JOIN org_info E
-				ON A.UnitID=E.org_id
-		  	INNER JOIN data_crkyw_tzdxx_flt_001 F on A.UnitID=F.UnitID AND A.tzdcbid=F.DataID
-		  LEFT JOIN data_crkyw_tzdxx_default B	-- 通知单信息
-				ON B.UnitID=F.UnitID and B.DataID=F.MainDataID
+		INNER JOIN data_crkyw_ckcmz_default D		-- 出库称毛重
+			ON A.BIZNO=D.BIZNO
+		INNER JOIN data_crkyw_ckcpz_default cp
+			ON D.BIZNO=cp.BIZNO
+		INNER JOIN org_info E
+			ON A.UnitID=E.org_id
+	  INNER JOIN business_store_ware_detail F on A.tzdcbid=F.id
+		LEFT JOIN basic_enum scnf ON scnf.parentId = 1004 and scnf.enumname = f.productive_year
 	WHERE D.DATAID=#{dataId} LIMIT 0,1;
 	</insert>
 	<insert id="addQckcStock">

src/main/resources/mapper/business/qcrk/DataCrkywJyxxDefaultMapper.xml

@@ -149,13 +149,14 @@ ORDER BY
         b.IsAudited AS "IsAudited",
         b.jyjg AS "jyjg",
         b.lsdj AS "lsdj",
-        b.dj AS "dj",
+        IFNULL(b.dj,c.in_price/1000) AS "dj",
         b.jybz AS "jybz",
         b.DataID AS "DataID"
         FROM
         DATA_CRKYW_RMDJ_DEFAULT a
         LEFT JOIN DATA_CRKYW_JYXX_DEFAULT b ON a.BizNo = b.BizNo
         LEFT JOIN basic_enum mxpz_enum on mxpz_enum.enumId = a.mxpz
+        LEFT JOIN business_store_ware_detail c on a.tzdcbid = c.id
         <where>
             <if test='id != null and id != ""'>
                 and b.DataID = #{id}

src/main/resources/mapper/business/qcrk/DataCrkywTzdxxDefaultMapper.xml

@@ -121,9 +121,9 @@
     <select id="queryQcInTzdInfByDepot" resultType="java.util.Map">
           SELECT
         ifnull(xzklhjz, 0.0) AS "zl",
-        ifnull(c.shiping_count, 0.0) AS "sl",
-        ifnull(c.remain_quantity, 0.0) AS "sysl",
-        ifnull(c.complete_quantity, 0.0) AS "wcsl",
+        ifnull(c.shiping_count*1000, 0.0) AS "sl",
+        ifnull(c.remain_quantity*1000, c.shiping_count*1000) AS "sysl",
+        ifnull(c.complete_quantity*1000, 0.0) AS "wcsl",
         ifnull(c.id, '') AS "dataId",
         ifnull(b.tzdcbid, '') AS "tzdcbid",
         ifnull(b.tzdbh, '') AS "tzdh"
@@ -153,9 +153,9 @@
     <select id="queryQCOutTzdInfByDepot" resultType="java.util.Map">
             SELECT
         ifnull(klhjz, 0.0) AS "zl",
-        ifnull(c.shiping_count, 0.0) AS "sl",
-        ifnull(c.remain_quantity, 0.0) AS "sysl",
-        ifnull(c.complete_quantity, 0.0) AS "wcsl",
+        ifnull(c.shiping_count*1000, 0.0) AS "sl",
+        ifnull(c.remain_quantity*1000, c.shiping_count*1000) AS "sysl",
+        ifnull(c.complete_quantity*1000, 0.0) AS "wcsl",
         ifnull(c.id, '') AS "dataId",
         ifnull(b.tzdcbid, '') AS "tzdcbid",
         ifnull(b.tzdbh, '') AS "tzdh"
@@ -227,15 +227,15 @@ LEFT JOIN basic_enum grain_kind_enum ON  grain_kind_enum.enumId = DATA_CRKYW_TZD
         notice.id AS "dataid",  -- 主表ID
         notice.id AS tzdID, -- 通知单id
         notice.bill_number AS tzdbh, -- 通知单编号,
-        shiping_count  as sl, -- 通知单数量
-        IF(detail.in_count > 0,in_count,out_count)-IFNULL(detail.complete_quantity,0) AS sysl, -- 剩余数量
-        IF(detail.in_count > 0,'A7B1FDB54DE7B32D6F8067FEFE2BF52F','6FD0418CD28A2B3F3E7E9EC0D7429461') as FLOWID, -- 流程Id
+        shiping_count*1000  as sl, -- 通知单数量
+        CASE WHEN notice.bill_type=1 THEN in_count*1000-IFNULL(detail.complete_quantity,0)*1000 ELSE out_count*1000-IFNULL(detail.complete_quantity,0)*1000 END AS sysl, -- 剩余数量
+        CASE WHEN notice.bill_type=1 THEN '420801654D8F01A7D9FCE01B90A395E6' ELSE '284344D15DCA72D90AA43C24BD4F9B47' END AS FLOWID, -- 流程Id
         DATE_FORMAT(detail.input_time,'%Y-%m-%d %T') AS rcsj -- 入仓时间
         ,notice.contract AS htbh -- 合同编号
         ,notice.contract_bid AS htId -- 合同id
-        ,plan.plan_number AS jhdbh -- 计划编号
+        ,notice.plan_number AS jhdbh -- 计划编号
         ,notice.plan_bid AS jhdId -- 计划id
-        ,enum.enumName  as jhfl -- 计划分类
+        ,plan.plan_type  as jhfl -- 计划分类
         ,customer.name as slr -- <!-- 客户名称 -->
         ,customer.address as slrdz, -- <!-- 地址 -->
         IFNULL(customer.social_credit_code,customer.identification) as slrsfzh,-- <!-- 企业信用代码或者身份证号 -->
@@ -262,7 +262,7 @@ LEFT JOIN basic_enum grain_kind_enum ON  grain_kind_enum.enumId = DATA_CRKYW_TZD
         detail.grain_producing_area AS "cd",
 
         tzscnf_enum.enumName AS "tzscnf_value", -- 生产年份名称
-        detail.grain_annual AS "scnf",
+        tzscnf_enum.enumId AS "scnf",
 
         detail.house_id as chID, -- 仓房id
         detail.warehouse_id as hwID, -- 货位id
@@ -272,23 +272,23 @@ LEFT JOIN basic_enum grain_kind_enum ON  grain_kind_enum.enumId = DATA_CRKYW_TZD
         business_delivery_storage_notice notice
         inner JOIN business_store_ware_detail detail on notice.id = detail.zid
         left join business_customer customer on customer.id=notice.customer_bid
-        left join business_plan plan on notice.plan_bid = plan.id
-        left join basic_enum enum on  plan.execute_type = enum.enumId
+        left join business_rp_report plan on notice.plan_bid = plan.id
+        -- left join basic_enum enum on  plan.execute_type = enum.enumId
 
         LEFT JOIN basic_enum lsxz_enum ON lsxz_enum.enumId = detail.grain_attribute
-        LEFT JOIN basic_enum tzscnf_enum ON tzscnf_enum.enumId = detail.grain_annual
+        LEFT JOIN basic_enum tzscnf_enum ON tzscnf_enum.parentId = 1004 and tzscnf_enum.enumname = detail.productive_year
         LEFT JOIN basic_enum cd_enum ON cd_enum.enumId = detail.grain_producing_area
 
         LEFT JOIN basic_enum grain_attribute_enum ON  grain_attribute_enum.enumId = detail.grain_attribute
         LEFT JOIN basic_enum grain_grade_enum ON grain_grade_enum.enumId = detail.grain_grade
         LEFT JOIN basic_enum grain_kind_enum ON  grain_kind_enum.enumId = detail.grain_kind
         LEFT JOIN basic_enum grain_detail_kind_enum ON grain_detail_kind_enum.enumId = detail.grain_detail_kind
-
-        WHERE ((notice.audit_state=2) or (notice.bill_type=2)) -- <!-- 审批通过的,中转通知单没有审批 -->
+        WHERE
+        notice.audit_state=2
         and notice.in_application = 1
         AND notice.house_id = #{unitId}   -- <!--用house_id 区分是哪个库的 house_id是代储库 orgId 是主库 -->
-        and IF(detail.in_count > 0,'A7B1FDB54DE7B32D6F8067FEFE2BF52F','6FD0418CD28A2B3F3E7E9EC0D7429461') = #{flowId}
-        AND IF(detail.in_count > 0,in_count,out_count)-IFNULL(detail.complete_quantity,0) >0
+        and  CASE WHEN notice.bill_type=1 THEN '420801654D8F01A7D9FCE01B90A395E6' ELSE '284344D15DCA72D90AA43C24BD4F9B47' END = #{flowId}
+        AND CASE WHEN notice.bill_type=1 THEN in_count-IFNULL(detail.complete_quantity,0) ELSE out_count-IFNULL(detail.complete_quantity,0) END >0
         ORDER BY notice.bill_number
     </select>
 </mapper>

src/main/resources/mapper/common/BizflowtrailMapper.xml

@@ -22,5 +22,79 @@
         <result column="note" property="note" />
         <result column="UPDATE_TIME" property="updateTime" />
     </resultMap>
+    <select id="getCrkPzInfo" resultType="java.util.Map">
+        <choose>
+            <when test="direction==1">
+                SELECT
+                a.lspz,
+                e.enumname as lspzName,
+                a.unitid as unitId,
+                b.org_name AS orgName,
+                DATE_FORMAT(a.ywdjsj,'%Y-%m-%d') as ywrq,
+                a.slr,a.cph
+                FROM
+                data_crkyw_rmdj_default a
+                INNER JOIN data_crkyw_qyxx_default c on a.BizNo = c.BizNo
+                INNER JOIN org_info b ON a.UnitID = b.org_id
+                LEFT JOIN basic_enum e  on e.enumId = a.lspz
+                WHERE
+                a.bizno = #{bizNo}
+            </when>
+            <otherwise>
+                SELECT
+                a.lspz,
+                e.enumname as lspzName,
+                a.unitid as unitId,
+                b.org_name AS orgName,
+                DATE_FORMAT(a.rmsj,'%Y-%m-%d') as ywrq,
+                a.slr,a.cph
+                FROM
+                data_crkyw_ckrmdj_default a
+                INNER JOIN data_crkyw_ckcpz_default c on a.BizNo = c.BizNo
+                INNER JOIN org_info b ON a.UnitID = b.org_id
+                LEFT JOIN basic_enum e  on e.enumId = a.lspz
+                WHERE
+                a.bizno = #{bizNo}
+            </otherwise>
+        </choose>
+    </select>
+    <select id="getCircleBusinessInfo" resultType="java.util.Map">
+        <choose>
+            <when test="direction==1">
+                select
+                DATE_FORMAT(a.jmsj,'%Y-%m-%d') as "ywrq",
+                a.klhjz as "sl",
+                f.storehouse_name as "cfmc",
+                e.enumname as "lsdjName"
+
+                from data_crkyw_ckcmz_default a
+                INNER JOIN data_crkyw_ckrmdj_default c on a.UnitID=c.UnitID and a.BizNo=c.BizNo
+                LEFT JOIN basic_enum e on  c.lydj=e.enumId
+                LEFT JOIN basic_storehouse f on a.sjckch = f.storehouse_id
+                where
+                a.UnitID != #{unitId}
+                and c.lspz= #{lspz} and c.cph = #{cph}
+                and DATE_FORMAT(a.jmsj,'%Y-%m-%d') between #{beginDay} and  #{endDay}
+                order by a.jmsj desc limit 1
+            </when>
+            <otherwise>
+                select
+                DATE_FORMAT(a.cpzsj,'%Y-%m-%d') as "ywrq",
+                a.xzklhjz as "sl",
+                f.storehouse_name as "cfmc",
+                e.enumname as "lsdjName"
+                from data_crkyw_cpz_default a
+                INNER JOIN data_crkyw_jyxx_default b on a.UnitID=b.UnitID and a.BizNo=b.BizNo
+                INNER JOIN data_crkyw_rmdj_default c on a.UnitID=c.UnitID and a.BizNo=c.BizNo
+                LEFT JOIN basic_enum e on  b.lsdj=e.enumId
+                LEFT JOIN basic_storehouse f on a.sjchID = f.storehouse_id
+                where
+                a.UnitID != #{unitId}
+                and c.lspz= #{lspz} and c.cph = #{cph}
+                and DATE_FORMAT(a.cpzsj,'%Y-%m-%d') between #{beginDay} and  #{endDay}
+                order by a.cpzsj desc limit 1
+            </otherwise>
+        </choose>
+    </select>
 
 </mapper>

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

@@ -16,6 +16,10 @@
                     <result column="bzq" property="bzq" />
                     <result column="xz" property="xz" />
                     <result column="deptId" property="deptId" />
+                    <result column="ch" property="ch" />
+                    <result column="hwh" property="hwh" />
+                    <result column="chmc" property="chmc" />
+                    <result column="hwmc" property="hwmc" />
                     <result column="sjjlpzmc" property="sjjlpzmc" />
                     <result column="sjjlpzbh" property="sjjlpzbh" />
                     <result column="sjjlppmc" property="sjjlppmc" />

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

@@ -16,6 +16,10 @@
                     <result column="bzq" property="bzq" />
                     <result column="xz" property="xz" />
                     <result column="deptId" property="deptId" />
+                    <result column="ch" property="ch" />
+                    <result column="hwh" property="hwh" />
+                    <result column="chmc" property="chmc" />
+                    <result column="hwmc" property="hwmc" />
                     <result column="sjjlpzmc" property="sjjlpzmc" />
                     <result column="sjjlpzbh" property="sjjlpzbh" />
                     <result column="sjjlppmc" property="sjjlppmc" />

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

@@ -46,11 +46,14 @@
                 a.sjjlspmcbh as "sjjlspmcbh",
                 a.isEnable as "isEnable",
                a.scpc as "scpc",
-               a.sccs as "sccs"
+               a.sccs as "sccs",
+               a.cjsj as "cjsj",
+               e.enumName as "djmc"
         FROM  data_crkyw_cplsp_default a
         LEFT JOIN  basic_enum b on a.sjjlppbh = b.enumId
         LEFT JOIN  basic_enum c on a.sjjlpzbh = c.enumId
         LEFT JOIN  basic_enum d on a.jldw = d.enumId
+        LEFT JOIN  basic_enum e on a.dj = e.enumId
         <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
             where  ${ew.sqlSegment}
         </if>

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

@@ -215,12 +215,13 @@
     </select>
     <select id="getPgGopsPlanList" resultType="com.unis.crk.cplbusiness.entity.result.BusinessPgGopsPlanVO">
         SELECT
-        a.id as "DataID",
+        a.id as "ddid",
         GROUP_CONCAT(c.sjjlspmc) as 'mxpzValue',
+        GROUP_CONCAT(d.enumname) as 'ppValue',
         '' as  "kfbh",
         a.org_id as "orgId",
         a.updatedate as "ModifyDate",
-        a.plan_code as "tzdbm",
+        a.plan_code as "ddbh",
         a.plan_name as "jhdmc",
         '' as  "htmc",
         a.plan_type "cazylx",
@@ -233,6 +234,7 @@
         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
+        LEFT JOIN basic_enum d on c.sjjlppbh = d.enumId
         WHERE
         a.org_id = #{unitId}
         <if test='planType != null and planType != ""'>
@@ -267,7 +269,7 @@
         (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.bzq as bzq,
         mxpz_enum.jldw as jldw,
         b.updatedate  as "ModifyDate",
         jldw_enum.enumName AS jldwmc,

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

@@ -277,6 +277,7 @@ ORDER BY a.hwh,a.scpc
 			a.scrq,    -- 11.生产日期
 			a.bzq,		 -- 11.保质期
 			a.xz,			 -- 12.性质
+			xz_enum.enumname as xzName,
 			a.bzq,
 			a.js,
 			a.kcsl,
@@ -302,7 +303,8 @@ ORDER BY a.hwh,a.scpc
 			LEFT JOIN data_crkyw_cplsp_default sjjlspmc_enum ON sjjlspmc_enum.sjjlspmcbh = a.sjjlspmcbh
 			and  sjjlspmc_enum.unitId = a.unitId
 			LEFT JOIN basic_enum sjjldjmc_enum ON sjjldjmc_enum.enumId = a.sjjldjbh
-		WHERE
+			LEFT JOIN basic_enum xz_enum on a.xz = xz_enum.enumId
+			where
 			 a.hwh = #{hwh}
 			and a.sjjlspmcbh = #{spbh}
 			and a.gg = #{gg}

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

@@ -47,30 +47,37 @@
         </resultMap>
 
     <select id="selectMyMapsPage" resultType="java.util.Map">
-        SELECT a.dataId,
-               a.qcbh,
-               a.rq,
-               a.scrq,
-               a.gg,
-               a.jldw,
-               a.kcsl,
-               a.scpc,
-               a.sjjlppbh,
-               sjjlppmc_enum.enumName as sjjlppmc,
-               a.sjjlpzbh,
-               sjjlpzmc_enum.enumName as sjjlpzmc,
-               a.sjjlspmcbh,
-               sjjlspmc_enum.sjjlspmc as sjjlspmc,
-               a.sjjldjbh,
-               sjjldjmc_enum.enumName as sjjldjmc,
-               jldwmc_enum.enumName as jldwmc
-               FROM  data_kcgl_cplqckc_default a
+        SELECT
+        a.dataId,
+        a.qcbh,
+        a.rq,
+        st.storehouse_name as chmc,
+        wa.warehouse_name as  hwmc,
+        a.cjsj,
+        a.scrq,
+        a.gg,
+        a.jldw,
+        a.kcsl,
+        a.scpc,
+        a.sjjlppbh,
+        sjjlppmc_enum.enumName AS sjjlppmc,
+        a.sjjlpzbh,
+        sjjlpzmc_enum.enumName AS sjjlpzmc,
+        a.sjjlspmcbh,
+        sjjlspmc_enum.sjjlspmc AS sjjlspmc,
+        a.sjjldjbh,
+        sjjldjmc_enum.enumName AS sjjldjmc,
+        jldwmc_enum.enumName AS jldwmc
+        FROM
+        data_kcgl_cplqckc_default a
         LEFT JOIN basic_enum sjjlppmc_enum ON sjjlppmc_enum.enumId = a.sjjlppbh
         LEFT JOIN basic_enum sjjlpzmc_enum ON sjjlpzmc_enum.enumId = a.sjjlpzbh
         LEFT JOIN data_crkyw_cplsp_default sjjlspmc_enum ON sjjlspmc_enum.sjjlspmcbh = a.sjjlspmcbh
-        and  sjjlspmc_enum.unitId = a.unitId
+        AND sjjlspmc_enum.unitId = a.unitId
         LEFT JOIN basic_enum sjjldjmc_enum ON sjjldjmc_enum.enumId = a.sjjldjbh
         LEFT JOIN basic_enum jldwmc_enum ON jldwmc_enum.enumId = a.jldw
+        LEFT JOIN basic_storehouse  st on a.ch = st.storehouse_id
+        LEFT JOIN basic_warehouse  wa on a.hwh = wa.warehouse_id
         <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
             where  ${ew.sqlSegment}
         </if>

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

@@ -99,10 +99,10 @@ SELECT
 	a.unitid, -- 2、单位id
 	e.org_name,   -- 3.站点名称
 	e.org_code,		-- 4.站点编码
-	a.ch,			-- 5.仓房
-	a.hwh,		-- 6.货位
-	a.chmc,   -- 7.仓房名称
-	a.hwmc,		-- 8.货位名称
+	b.ch,			-- 5.仓房
+	b.hwh,		-- 6.货位
+	b.chmc,   -- 7.仓房名称
+	b.hwmc,		-- 8.货位名称
 	#{loginName}, -- 9、创建人
 	a.cjsj,    -- 10.创建时间
 	b.scrq,    -- 11.生产日期
@@ -184,10 +184,10 @@ SELECT
 	a.unitid, -- 2、单位id
 	e.org_name,   -- 3.站点名称
 	e.org_code,		-- 4.站点编码
-	a.ch,			-- 5.仓房
-	a.hwh,		-- 6.货位
-	a.chmc,   -- 7.仓房名称
-	a.hwmc,		-- 8.货位名称
+	b.ch,			-- 5.仓房
+	b.hwh,		-- 6.货位
+	b.chmc,   -- 7.仓房名称
+	b.hwmc,		-- 8.货位名称
   #{loginName}, -- 9、创建人
 	a.cjsj,    -- 10.创建时间
 	b.scrq,    -- 11.生产日期