rev：修改

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml

@@ -141,7 +141,9 @@
                 WHEN '2' THEN '合格'
                 WHEN '3' THEN '不合格'
                 END
-            ) AS quality_name
+            ) AS quality_name,
+            late.material_type,
+            late.execution_stand
         FROM
             md_pb_storagevehicleext ext
             INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaInGroupBoxController.java

@@ -60,4 +60,11 @@ public class PdaInGroupBoxController {
         return new ResponseEntity<>(pdaInGroupBoxService.queryDevice(), HttpStatus.OK);
     }
 
+    @PostMapping("/queryExecution")
+    @Log("入库组盘查执行标准下拉框")
+    @SaIgnore
+    public ResponseEntity<Object> queryExecution() {
+        return new ResponseEntity<>(pdaInGroupBoxService.queryExecution(), HttpStatus.OK);
+    }
+
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaInGroupBoxService.java

@@ -59,4 +59,10 @@ public interface PdaInGroupBoxService {
      * @return PdaResponse
      */
     PdaResponse queryDevice();
+
+    /**
+     * 入库组盘查执行标准下拉框
+     * @return PdaResponse
+     */
+    PdaResponse queryExecution();
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaInGroupBoxServiceImpl.java

@@ -11,6 +11,7 @@ import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
 import org.nl.wms.basedata_manage.service.dao.EmBiDeviceinfo;
 import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
 import org.nl.wms.pda.general_management.service.PdaInGroupBoxService;
+import org.nl.wms.pda.util.PDAEnum;
 import org.nl.wms.pda.util.PdaResponse;
 import org.nl.wms.pdm_manage.service.IPdmBomCallMaterialService;
 import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial;
@@ -158,4 +159,9 @@ public class PdaInGroupBoxServiceImpl implements PdaInGroupBoxService {
         });
         return PdaResponse.requestParamOk(resultList);
     }
+
+    @Override
+    public PdaResponse queryExecution() {
+        return PdaResponse.requestParamOk(PDAEnum.EXECUTION_STAND.getDict());
+    }
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java

@@ -37,6 +37,13 @@ public enum PDAEnum {
     // 运送类型
     TASK_TYPE(MapOf.of("小料箱", "1", "大料箱或其他", "2")),
 
+    // 组盘物料执行标准
+    EXECUTION_STAND(MapOf.of("AWS A5.18", "AWS A5.18", "AWS A5.9M", "AWS A5.9M",
+            "GB/T 15620","GB/T 15620", "GB/T 17853","GB/T 17853",
+            "GB/T 8110","GB/T 8110", "GNB/T 47018","NB/T 47018"
+
+    )),
+
     ;
 
     private Map<String, String> code;

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java

@@ -149,6 +149,11 @@ public class GroupPlate implements Serializable {
      */
     private String is_return;
 
+    /**
+     * 物料类型： 0 - 压容 1 - 非压容
+     */
+    private String material_type;
+
     /**
      * 工单集合
      */