opt:优化

nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java

@@ -41,11 +41,12 @@ public interface ErpToWmsService {
      *                      {
      *                           mater_code：物料编码
      *                           mater_name：物料名称
-     *                           out_code：车间编号
      *                           qty：数量
      *                           unit_code：计量单位
      *                           order_code：单据号
-     *                           order_type：单据类型
+     *                           order_type：单据类型,
+     *                         "floor_code": "楼层数"
+     *                         "hoist_code": "提升机编号"
      *                      }
      *                 ]
      * }

nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/WmsToErpService.java

@@ -16,11 +16,8 @@ public interface WmsToErpService {
      * 出入库单据回传
      * @param whereJson {
      *     {
-     *     "order_code": "3000000056",
-     *     "order_type": "03",
      *     "pallet_sn": "zp0000000003",
-     *     "instor_time": "2025-07-21 23:23:01",
+     *     "instor_time": "2025-07-21 23:23:01"
-     *     "qty": "120.00"
      * }
      * }
      * @return JSONObject {
@@ -38,8 +35,7 @@ public interface WmsToErpService {
      *     "order_type": "03",
      *     "pallet_sn": "zp0000000003",
      *     "outstor_time": "2025-07-21 23:23:01",
-     *     "qty": "120.00",
+     *     "qty": "120.00"
-     *     "out_code": "s0001"
      *
      * }
      * @return JSONObject：{

nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java

@@ -162,11 +162,12 @@ public class ErpToWmsServiceImpl implements ErpToWmsService {
          *                      {
          *                           mater_code：物料编码
          *                           mater_name：物料名称
-         *                           out_code：车间编号
          *                           qty：数量
          *                           unit_code：计量单位
          *                           order_code：单据号
-         *                           order_type：单据类型
+         *                           order_type：单据类型,
+         *                         "floor_code": "楼层数"
+         *                         "hoist_code": "提升机编号"
          *                      }
          *                 ]
          */
@@ -218,7 +219,8 @@ public class ErpToWmsServiceImpl implements ErpToWmsService {
             jsonDtl.setUnit_name(unitDao.getUnit_name());
             jsonDtl.setCreate_name("ERP");
             jsonDtl.setCreate_time(DateUtil.now());
-            jsonDtl.setOut_code(json.getString("out_code"));
+            jsonDtl.setFloor_code(json.getString("floor_code"));
+            jsonDtl.setOut_code(json.getString("hoist_code"));
             dtlArr.add(jsonDtl);
         }
         //保存单据表

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java

@@ -172,6 +172,8 @@ public class PmFormData implements Serializable {
 
     private String out_code;
 
+    private String floor_code;
+
 }
 
 

nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/PmFormDataDto.java

@@ -148,9 +148,10 @@ public class PmFormDataDto implements Serializable {
     private String merge_codes;
 
     private String new_merge_flag;
-
     private String out_code;
 
+    private String floor_code;
+
     /**
      * 关联上级表单id
      */

nladmin-ui/src/views/wms/pm_manage/form_data2/index.vue

@@ -214,6 +214,8 @@ export default {
         return
       }
       const mater = this.rows[0].material_code
+      const out_code = this.rows[0].out_code
+      const floor_code = this.rows[0].floor_code
       for (let i = 0; i < this.rows.length; i++) {
         const now = this.rows[i]
         if (now.is_merge === '1') {
@@ -225,7 +227,15 @@ export default {
           return
         }
         if (now.material_code !== mater) {
-          this.crud.notify('合单的物料必须相同:' + now.material_code, CRUD.NOTIFICATION_TYPE.INFO)
+          this.crud.notify('合单的订单物料必须相同:' + now.material_code, CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        }
+        if (now.out_code !== out_code) {
+          this.crud.notify('合单的出库提升机必须相同:' + now.out_code, CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        }
+        if (now.floor_code !== floor_code) {
+          this.crud.notify('合单的订单楼层必须相同:' + now.floor_code, CRUD.NOTIFICATION_TYPE.INFO)
           return
         }
       }