修改

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -9,25 +9,19 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
-
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
-import org.nl.wms.log.LokiLog;
-import org.nl.wms.log.LokiLogType;
 import org.nl.wms.pda.mps.service.impl.BakingServiceImpl;
 import org.nl.wms.pda.st.service.PrintService;
 import org.nl.wms.sch.manage.TaskStatusEnum;
-import org.nl.wms.sch.service.TaskService;
 import org.nl.wms.sch.tasks.EmptyVehicleTask;
 import org.nl.wms.sch.tasks.SendOutTask;
 import org.nl.wms.st.inbill.service.RawAssistIStorService;
 import org.nl.wms.st.inbill.service.StorPublicService;
-import org.nl.wms.st.inbill.service.impl.RawAssistIStorServiceImpl;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,7 +30,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Service

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql

@@ -152,24 +152,17 @@
     IF 输入.flag = "8"
         QUERY
             SELECT
-                sub.package_box_SN,
+                package_box_SN,
-                sub.container_name,
+                container_name,
-                sub.product_name,
+                product_name,
-                sub.product_description,
+                product_description,
-                sub.net_weight
+                net_weight
             FROM
-                st_ivt_iostorinvdis dis
+                pdm_bi_subpackagerelation sub
-                LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
-                LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn
-                LEFT JOIN sch_base_task task ON task.vehicle_code = dis.storagevehicle_code
             WHERE
-                mst.bill_type = '1005'
+                sub.status = '0'
-                AND sub.STATUS = '0'
+            AND
-                AND mst.is_delete = '0'
+                sub.package_box_SN = 输入.box_no
-                AND mst.bill_status = '99'
-                AND dis.work_status = '99'
-                AND task.task_id IS NULL
-                AND sub.package_box_SN = 输入.box_no
             ENDSELECT
         ENDQUERY
     ENDIF

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -340,8 +340,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
             // 判断此明细子卷是否存在，存在则将此木箱下的子卷全部生成明细
             String pcsn = row.getString("pcsn");
+            String box_no = row.getString("box_no");
+            //查询该箱子所在货位
+            JSONObject struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '"+box_no+"'").uniqueResult(0);
+            String struct_code = struct_jo.getString("struct_code");
             if (ObjectUtil.isNotEmpty(pcsn)) {
-                JSONObject json = ivtTab.query("pcsn = '" + pcsn + "'").uniqueResult(0);
+                JSONObject json = ivtTab.query("pcsn = '" + pcsn + "' AND struct_code = '"+struct_code+"'").uniqueResult(0);
                 if (ObjectUtil.isEmpty(json)) continue;
 
                 JSONObject jsonMap = new JSONObject();
@@ -3903,7 +3907,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             //查询对应明细
             JSONObject dtl_jo = WQLObject.getWQLObject("st_ivt_iostorinvdtl").query("iostorinvdtl_id = '" + dis.getString("iostorinvdtl_id") + "'").uniqueResult(0);
             // 更新子卷包装关系表 状态 - 3
-            JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and status = '2'").uniqueResult(0);
+            JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and package_box_sn = '"+dis.getString("box_no")+"' and status = '2'").uniqueResult(0);
             if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn"));
             // 如果是拆分入库则将包装关系改为生成状态
             if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009") && StrUtil.isEmpty(dtl_jo.getString("source_bill_code")))) {

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql

@@ -137,6 +137,10 @@
                         attr.block_num = 输入.block_num
                 ENDOPTION
 
+                OPTION 输入.stor_id <> ""
+                        attr.stor_id = 输入.stor_id
+                ENDOPTION
+
                 group by attr.storagevehicle_code) a
 
                 order by a.instorage_time ASC

lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue

@@ -138,10 +138,10 @@
         <el-table-column prop="pcsn" label="批次号" align="center" />
         <el-table-column prop="box_no" label="载具号" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column prop="start_point_code" label="起始位置" align="center" />
+        <el-table-column prop="next_point_code" label="起始位置" align="center" />
-        <el-table-column prop="next_point_code" label="目的位置" align="center" />
+        <el-table-column prop="struct_code" label="目的位置" align="center" />
         <el-table-column prop="task_code" label="任务号" align="center" />
-        <el-table-column prop="taskdtl_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
+        <el-table-column prop="task_type_name" label="任务类型" align="center" width="150px" />
       </el-table>
     </el-card>
   </el-dialog>