成品粮和原粮修改

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

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/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/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("保存成品粮期初库存失败");

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, -- 通知单数量
-        CASE WHEN notice.bill_type=1 THEN in_count-IFNULL(detail.complete_quantity,0) ELSE out_count-IFNULL(detail.complete_quantity,0) END AS sysl, -- 剩余数量
+        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,11 +272,11 @@ 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