代码合并

2022-11-28 10:24:54 +08:00
parent abf16a9b13
commit b4a7738b22
6 changed files with 33 additions and 184 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
@@ -53,7 +53,8 @@
                mater.material_code,
                mater.material_name,
                unit.unit_name,
-                region.region_name
+                region.region_name,
+                sub.sap_pcsn
                FROM
                    ST_IVT_StructIvt ivt
                    LEFT JOIN sch_base_point point ON ivt.struct_id = point.source_id
@@ -61,6 +62,7 @@
                    LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
                    LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
                    LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id
+                    LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn
            WHERE
                 1 = 1

--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -688,8 +688,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
    public JSONObject childRollPackComplete(JSONObject param) {
        log.info("childRollPackComplete接口输入参数为：-------------------" + param.toString());

-        String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue();
-        if (StrUtil.equals(is_mesTolms, "1")) {
+//        String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue();
+//        if (StrUtil.equals(is_mesTolms, "1")) {
            String isUnPlanProductionBox = param.getString("isUnPlanProductionBox"); // 生产订单
            String QuanlityInBox = param.getString("QuanlityInBox"); // 产品编码
            String QualityGuaranPeriod = param.getString("QualityGuaranPeriod"); // 分切机台编码
@@ -764,7 +764,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                map.put("box_weight", String.valueOf(BoxWeight));
                tab.update(map,"package_box_sn = '"+PackageBoxSN+"'");
            }
-        }
+//        }
        JSONObject result = new JSONObject();
        result.put("RTYPE", "S");
        result.put("RTMSG", "操作成功!");
@@ -784,8 +784,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
    @Override
    public JSONObject inventoryTransferInfoSync(JSONObject param) {
        log.info("inventoryTransferInfoSync接口输入参数为：-------------------" + param.toString());
-        String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue();
-        if (StrUtil.equals(is_mesTolms, "1")) {
+//        String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue();
+//        if (StrUtil.equals(is_mesTolms, "1")) {
            try {
                JSONArray rows = param.getJSONArray("item");
                String SaleOrderItem = param.getString("SaleOrderItem");
@@ -872,7 +872,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                System.out.println(result);
                return result;
            }
-        }
+//        }

        JSONObject result = new JSONObject();
        result.put("RTYPE", "S");
@@ -894,8 +894,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
    public JSONObject childRollInfoUpdate(JSONObject param) {
        log.info("childRollInfoUpdate接口输入参数为：-------------------" + param.toString());

-        String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue();
-        if (StrUtil.equals(is_mesTolms, "1")) {
+//        String is_mesTolms = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_mesTolms").getValue();
+//        if (StrUtil.equals(is_mesTolms, "1")) {
            String ContainerName = param.getString("ContainerName");
            String SaleOrderName = param.getString("SaleOrderName");
            String isUnPlanProduction = param.getString("isUnPlanProduction");
@@ -923,7 +923,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                new_sub.put("workorder_id",IdUtil.getSnowflake(1, 1).nextId() + "");
                WQLObject.getWQLObject("PDM_BI_SubPackageRelationChangeFlow").insert(new_sub);*/
            }
-        }
+//        }

        JSONObject result = new JSONObject();
        result.put("RTYPE", "S");
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -2442,11 +2442,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
        // 5.单组填充
        HashMap<String, Object> oneMap = new HashMap<>();

-        // 送货单号
        JSONObject jsonDtl = dtlTab.query("iostorinv_id = '" + jsonMst.getString("iostorinv_id") + "'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(jsonDtl)) oneMap.put("vbeln",jsonDtl.getString("vbeln"));
-        // 页码
-        String pageNow = String.valueOf(j + 1);
+        if (ObjectUtil.isNotEmpty(jsonDtl)) {
+            // 送货单号
+            oneMap.put("vbeln",jsonDtl.getString("vbeln"));
+            // 订单号
+            String source_bill_code = jsonDtl.getString("source_bill_code");
+            if (ObjectUtil.isNotEmpty(source_bill_code)) {
+                oneMap.put("order_no",source_bill_code.substring(0,source_bill_code.indexOf("-")));
+            }
+        }
+        String pageNow = String.valueOf(j + 1); // 页码
        oneMap.put("page",pageNow+ "/" +  MapUtil.getStr(whereJson,"pageNum"));
        oneMap.put("consignee", jsonMst.getString("consignee")); // 收货单位
        oneMap.put("receiver", jsonMst.getString("receiver")); // 收货人
@@ -2482,6 +2488,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
            WriteSheet sheet = EasyExcel.writerSheet().build();
            for (int i = 0; i < dtlArr.size(); i++) {
                JSONObject json = dtlArr.getJSONObject(i);
+
                JSONObject jsonSub = subTab.query("package_box_sn = '" + json.getString("box_no") + "'").uniqueResult(0);
                if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("没有查询到子卷包装");
                order_no = jsonSub.getString("sale_order_name");
@@ -2508,9 +2515,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue();
            }
            // 订单号
-            if (ObjectUtil.isNotEmpty(order_no)) {
+           /* if (ObjectUtil.isNotEmpty(order_no)) {
                oneMap.put("order_no",order_no.substring(0,order_no.indexOf("-")));
-            }
+            }*/
            oneMap.put("all_qty",all_qty); // 合计
            workBook.fill(oneMap, sheet);
            workBook.fill(new FillWrapper("data", flData), sheet);
@@ -2558,9 +2565,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {

            }
            // 订单号
-            if (ObjectUtil.isNotEmpty(order_no)) {
+          /*  if (ObjectUtil.isNotEmpty(order_no)) {
                oneMap.put("order_no",order_no.substring(0,order_no.indexOf("-")));
-            }
+            }*/
            oneMap.put("all_qty",all_qty); // 合计
            WriteSheet sheet = EasyExcel.writerSheet(0).build();
            workBook.fill(oneMap, sheet);
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -71,7 +71,9 @@
 		PAGEQUERY
 			SELECT
 			    ios.*,
-			    cu.shd_dtl_num
+			    cu.shd_dtl_num,
+			    cu.cust_name,
+			    cu.cust_simple_name
            FROM
            	ST_IVT_IOStorInv ios
            	LEFT JOIN md_cs_customerbase cu ON ios.cust_code = cu.cust_code