opt: 修复5

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructattrController.java

@@ -1,5 +1,6 @@
 package org.nl.wms.basedata_manage.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
@@ -39,6 +40,7 @@ public class StructattrController {
 
     @GetMapping
     @Log("查询仓位")
+    @SaIgnore
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(structattrService.queryAll(whereJson, page)), HttpStatus.OK);
     }

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

@@ -143,6 +143,7 @@
         INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id
         <where>
             1 = 1
+            AND attr.occupancy_state = 3
             <if test="param.stor_id != null and param.stor_id != ''">
                 AND
                 attr.stor_id = #{param.stor_id}
@@ -170,11 +171,12 @@
                 (mater.material_code LIKE CONCAT('%', #{param.material_code},'%') or
                 mater.material_name LIKE CONCAT('%',  #{param.material_code},'%') )
             </if>
-
             <if test="param.pcsn != null and param.pcsn != ''">
                 AND
                 ext.pcsn LIKE #{param.pcsn}
             </if>
+            AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '5'
+            AND t.is_delete = '0' AND (t.vehicle_code = ext.storagevehicle_code OR t.vehicle_code2 = ext.storagevehicle_code))
         </where>
         ORDER BY ext.create_time Desc
     </select>
@@ -209,6 +211,7 @@
         INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id
         <where>
             1 = 1 and ext.`status`='02'
+            AND attr.occupancy_state = 3
             <if test="param.stor_id != null and param.stor_id != ''">
                 AND
                 attr.stor_id = #{param.stor_id}
@@ -256,6 +259,8 @@
                 AND
                 ext.pcsn LIKE #{param.pcsn}
             </if>
+            AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '5'
+            AND t.is_delete = '0' AND (t.vehicle_code = ext.storagevehicle_code OR t.vehicle_code2 = ext.storagevehicle_code))
         </where>
         ORDER BY ext.create_time Desc
     </select>

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

@@ -88,7 +88,7 @@ public class WmsToMesServiceImpl implements WmsToMesService {
             log.info("uploadMes回传接口输出参数为：-------------------" + result.toString());
 
 
-            Integer status = result.getInteger("status");
+            Integer status = result.getInteger("code");
             if (status != HttpStatus.OK.value()) {
                 throw new BadRequestException(result.getString("message"));
             }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java

@@ -22,13 +22,13 @@ public enum IOSEnum {
     UPDATE_IVT_TYPE(MapOf.of("入库", "1", "出库", "2")),
 
     //单据出入库类型
-    IO_TYPE(MapOf.of("入库","0", "出库", "1")),
+    IO_TYPE(MapOf.of("入库", "0", "出库", "1")),
 
     //单据状态
-    BILL_STATUS(MapOf.of("生成","10", "分配中", "20", "分配完", "30", "完成", "99")),
+    BILL_STATUS(MapOf.of("生成", "10", "分配中", "20", "分配完", "30", "完成", "99")),
 
     // 入库业务类型
-    BILL_TYPE(MapOf.of("生产入库","0001", "手工入库", "0009")),
+    BILL_TYPE(MapOf.of("生产入库", "0001", "手工入库", "0009")),
 
     //入库分配明细状态
     INBILL_DIS_STATUS(MapOf.of("未生成", "00", "生成", "01", "执行中", "02", "完成", "99")),
@@ -38,11 +38,11 @@ public enum IOSEnum {
 
     // 锁类型
     LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2"
-            , "移入锁", "3", "移出锁", "4", "其他锁","9"
+            , "移入锁", "3", "移出锁", "4", "其他锁", "9"
     )),
 
     // 点位状态
-    POINT_STATUS(MapOf.of("无货", "1", "空载具", "2" , "有货", "3" )),
+    POINT_STATUS(MapOf.of("无货", "1", "空载具", "2", "有货", "3")),
 
     // 单据创建类型
     CREATE_MODE(MapOf.of("PC产生", "1", "终端产生", "2", "外部接口产生", "3", "手动", "4")),

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java

@@ -1073,7 +1073,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
                 task_form2.put("task_group_id", taskGroupId);
                 task_form2.put("task_group_seq", "2");
                 task_form2.put("create_mode", whereJson.getString("create_mode"));
-                task_form.put("ext_task_code", whereJson.getString("ext_task_code"));
+                task_form2.put("ext_task_code", whereJson.getString("ext_task_code"));
 
                 //这个需求特殊，因为会产生2个task,并且第二个task后结束，因此以第二个task_id为准！！
                 task_id = downEmptyUpFullTask.create(task_form2);