代码更新

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

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.text.StrBuilder;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.SecurityUtils;
 import org.nl.modules.system.service.impl.ParamServiceImpl;
@@ -2751,7 +2752,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         oneMap.put("page",pageNow+ "/" +  MapUtil.getStr(whereJson,"pageNum"));
         oneMap.put("consignee", jsonMst.getString("consignee")); // 收货单位
         oneMap.put("receiver", jsonMst.getString("receiver")); // 收货人
-        oneMap.put("receiptaddress", jsonMst.getString("receiptaddress")); // 收货地址
+        String receiptaddress = jsonMst.getString("receiptaddress");
+ /*       StrBuilder strBuilder = new StrBuilder(receiptaddress);
+
+        if (receiptaddress.length() > 10) {
+            strBuilder.insert(11,"\n");
+        }*/
+        oneMap.put("receiptaddress", receiptaddress); // 收货地址
         oneMap.put("receiptphone", jsonMst.getString("receiptphone")); // 收货人联系电话
         // 物流公司
         JSONObject jsonTran = tranTab.query("cust_code = '" + jsonMst.getString("trans_code") + "'").uniqueResult(0);

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

@@ -343,13 +343,19 @@
                         task.task_status,
                         task.task_type,
                         point2.point_code,
-                        sub.sap_pcsn
+                        sub.sap_pcsn,
+                        attr.out_order_seq,
+                        attr.row_num,
+                        attr.col_num,
+                        attr.layer_num,
+                        attr.block_num
                     FROM
                         ST_IVT_IOStorInvDis dis
                     LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = dis.iostorinv_id
                     LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
                     LEFT JOIN SCH_BASE_Task task ON task.task_id = dis.task_id
                     LEFT JOIN SCH_BASE_Point point2 ON point2.point_id = dis.point_id
+                    LEFT JOIN st_ivt_structattr attr ON attr.struct_id = dis.struct_id
                     LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn
                     WHERE
                         1 = 1
@@ -375,7 +381,7 @@
                           dis.work_status <= 输入.bill_status
                     ENDOPTION
 
-                    order by dis.struct_code ASC
+                    order by attr.row_num,attr.out_order_seq ASC
                     ENDSELECT
                 ENDQUERY
         ENDIF

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

@@ -84,7 +84,7 @@
                         st_ivt_structattr sa3
                     WHERE
                         IFNULL( sa3.storagevehicle_code, '' ) <> ''
-                        AND AND sa3.lock_type = '1'
+                        AND sa3.lock_type = '1'
                     ) c
                 WHERE
                     c.block_num = a.block_num
@@ -137,7 +137,7 @@
                			st_ivt_structattr sa2
                		WHERE
                			IFNULL( sa2.storagevehicle_code, '' ) <> ''
-               			AND AND sa2.lock_type = '1'
+               			AND sa2.lock_type = '1'
                		) b
                	WHERE
                		b.block_num = a.block_num