From 6439daf3ccfba6f0c6396e4a54e479a0996c1b13 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 3 Feb 2023 21:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/st/service/impl/PrintServiceImpl.java |  10 ++-
 .../src/main/java/org/nl/wms/pdm/wql/pdm.xls  | Bin 249344 -> 249856 bytes
 .../impl/RawAssistIStorServiceImpl.java       |  60 +++++++++++++++---
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
index 5d6828bd5..121c70358 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.*;
+import java.util.HashMap;
 
 /**
  * @author liuxy
@@ -83,6 +84,7 @@ public class PrintServiceImpl implements PrintService {
         String date_of_FG_inbound = jsonInbound.getString("date_of_fg_inbound");
         //毛重
         String box_weight = NumberUtil.round(box_jo.getString("box_weight"),2).toString();
+//        String box_weight = NumberUtil.round(box_jo.getString("real_weight"),2).toString();
         //生产日期：取此箱子中最晚的生产日期
         JSONObject jsonProduction = subTab.query("package_box_sn = '" + box_no + "' order by date_of_production DESC").uniqueResult(0);
         String date_of_production = jsonProduction.getString("date_of_production");
@@ -211,7 +213,13 @@ public class PrintServiceImpl implements PrintService {
         //入库日期:取此箱子中最晚的入库日期
         JSONObject jsonInbound= subTab.query("package_box_sn = '" + box_no + "' order by date_of_fg_inbound DESC").uniqueResult(0);
         String date_of_FG_inbound = jsonInbound.getString("date_of_fg_inbound");
-        //毛重
+        //更新实际重量
+        double real_weight = whereJson.getDoubleValue("box_weight");
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("real_weight",real_weight);
+
+        subTab.update(map,"package_box_sn = '"+package_box_sn+"'");
+
         String box_weight = NumberUtil.round(whereJson.getString("box_weight"),2).toString();
         //生产日期：取此箱子中最晚的生产日期
         JSONObject jsonProduction = subTab.query("package_box_sn = '" + box_no + "' order by date_of_production DESC").uniqueResult(0);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
index dd66267d3f0931375366a2188db48fd8408a7be9..88b2e50dedc5cb55dd3a03c09cad3f324f741156 100644
GIT binary patch
delta 11523
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
Bpeg_W

delta 11579
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
RGXD@=KyDZd57E=j{txPhkx~Ev

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
index eaddce640..023398aa0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
@@ -852,21 +852,61 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
                 String out_order_seq = jsonDescBox.getString("out_order_seq");
                 // 上一个货位顺序号
                 String out_order_seq_desc = String.valueOf(NumberUtil.add(out_order_seq, "1"));
-                JSONObject jsonDescStruct = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' and out_order_seq = '"+out_order_seq_desc+"'").uniqueResult(0);
+                JSONObject jsonDescStruct = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' and out_order_seq = '" + out_order_seq_desc + "'").uniqueResult(0);
 
                 if (ObjectUtil.isNotEmpty(jsonDescStruct)) {
                     struct_jo = jsonDescStruct;
                 } else {
-                   // 没有就正序找到第一个物料、判断上一个是否有货位
-                    JSONObject jsonAscBox = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') <> '' order by out_order_seq ASC").uniqueResult(0);
-                    String out_order_seq2 = jsonAscBox.getString("out_order_seq");
-                    // 上一个货位顺序号
-                    String out_order_seq_asc = String.valueOf(NumberUtil.sub(out_order_seq2, "1"));
-                    JSONObject jsonAscStruct = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' and out_order_seq = '"+out_order_seq_asc+"'").uniqueResult(0);
+                    // 说明这排有任务在执行，新开一排
+                    //根据分切计划查询该订单物料大概还有多少未入
+                    row_map.put("flag", "12");
+                    JSONArray plan_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(row_map).process().getResultJSONArray(0);
+                    if (ObjectUtil.isEmpty(plan_rows)) {
+                        plan_rows = new JSONArray();
+                    }
+                    //查询该销售订单及行号有多少个生成状态的箱子
+                    row_map.put("flag", "27");
+                    JSONArray box_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(row_map).process().getResultJSONArray(0);
+                    if (ObjectUtil.isEmpty(box_rows)) {
+                        box_rows = new JSONArray();
+                    }
+                    int box_num = (int) Math.ceil(plan_rows.size() / 2) + box_rows.size();
+
+                    //查询数量与订单物料箱子数量相近的一排
+                    JSONObject empty_row = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("sect_id", sect_id).addParam("flag", "13").addParam("sql_str", " ORDER BY abs(" + box_num + "-a.struct_num),block_num,row_num").process().uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(empty_row)) {
+                        String block_num2 = empty_row.getString("block_num");
+                        String row_num2 = empty_row.getString("row_num");
+                        String placement_type2 = empty_row.getString("placement_type");
+
+                        if (placement_type.equals("02")) {
+                            struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num2 + "' AND row_num = '" + row_num2 + "' AND placement_type = '" + placement_type2 + "' AND is_delete = '0' AND is_used = '1' AND lock_type = '1' order by out_order_seq ASC").uniqueResult(0);
+                        } else {
+                            struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num2 + "' AND row_num = '" + row_num2 + "' AND placement_type = '" + placement_type2 + "'AND is_delete = '0' AND is_used = '1' AND lock_type = '1' order by out_order_seq DESC").uniqueResult(0);
+                        }
+                    } else {
+
+                        //如果查询不到空的一排，则查询有空位双通的一排
+                        JSONObject have_row = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("sect_id", sect_id).addParam("flag", "14").addParam("sql_str", " ORDER BY abs(" + box_num + "-a.struct_num)").process().uniqueResult(0);
+
+                        if (ObjectUtil.isNotEmpty(have_row)) {
+                            String block_num3 = have_row.getString("block_num");
+                            String row_num3 = have_row.getString("row_num");
+
+                            //判断该排是左边为空，还是右边为空
+                            JSONObject right_str = WQLObject.getWQLObject("st_ivt_structattr").query("block_num = '" + block_num3 + "' AND row_num = '" + row_num3 + "' AND is_delete = '0' AND is_used = '1' order by out_order_seq").uniqueResult(0);
+                            JSONObject left_str = WQLObject.getWQLObject("st_ivt_structattr").query("block_num = '" + block_num3 + "' AND row_num = '" + row_num3 + "' AND is_delete = '0' AND is_used = '1' order by out_order_seq desc").uniqueResult(0);
+                            if (StrUtil.isNotEmpty(right_str.getString("storagevehicle_code")) || !right_str.getString("lock_type").equals("1")) {
+                                struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num3 + "' AND row_num = '" + row_num3 + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' order by out_order_seq").uniqueResult(0);
+                            }
+                            if (StrUtil.isNotEmpty(left_str.getString("storagevehicle_code")) || !left_str.getString("lock_type").equals("1")) {
+                                struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND  block_num = '" + block_num3 + "' AND row_num = '" + row_num3 + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' order by out_order_seq desc").uniqueResult(0);
+                            }
+                        }
+
+                    }
 
-                    if (ObjectUtil.isNotEmpty(jsonAscStruct)) struct_jo = jsonAscStruct;
                 }
-
             }
         } else {
             //如果不存在相同订单物料的巷道
@@ -904,7 +944,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
                     struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "' AND row_num = '" + row_num + "' AND placement_type = '" + placement_type + "'AND is_delete = '0' AND is_used = '1' AND lock_type = '1' order by out_order_seq DESC").uniqueResult(0);
                 }
             } else {
-                
+
                 //如果查询不到空的一排，则查询有空位双通的一排
                 JSONObject have_row = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("sect_id", sect_id).addParam("flag", "14").addParam("sql_str", " ORDER BY abs(" + box_num + "-a.struct_num)").process().uniqueResult(0);