rev:修改单据作业任务回显问题；add:手持拣选功能;fix:入阻挡分配到原来货位问题

wms_pro/hd/nladmin-system/pom.xml

@@ -33,8 +33,6 @@
             <artifactId>dynamic-tp-spring-boot-starter-adapter-webserver</artifactId>
             <version>1.1.7</version>
         </dependency>
-
-
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
@@ -291,6 +289,12 @@
             <groupId>com.yomahub</groupId>
             <artifactId>tlog-all-spring-boot-starter</artifactId>
             <version>1.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>tlog-hutool-http</artifactId>
+                    <groupId>com.yomahub</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
     <build>

wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java

@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 @ServletComponentScan
 @EnableTransactionManagement
 @MapperScan("org.nl.**.mapper")
-@EnableDynamicTp
+//@EnableDynamicTp
 public class AppRun implements CommandLineRunner {
     public static void main(String[] args) {
         SpringApplication.run(AppRun.class, args);

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java

@@ -29,10 +29,11 @@ public class SecurityUtils {
                 return json.toBean(CurrentUser.class);
             }
         } catch (Exception e) {
+            e.printStackTrace();
             CurrentUser currentUser = new CurrentUser();
-            currentUser.setId("2");
+            currentUser.setId("1");
             currentUser.setPresonName("外部系统用户");
-            currentUser.setUsername("default");
+            currentUser.setUsername("admin");
             return currentUser;
         }
         return null;

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml

@@ -56,9 +56,9 @@
                 LEFT JOIN st_ivt_structattr ON md_pb_vehicleMater.vehicle_code = st_ivt_structattr.vehicle_code
                 LEFT JOIN md_me_materialbase ON md_pb_vehicleMater.material_id = md_me_materialbase.material_id
                 LEFT JOIN sch_base_task ON md_pb_vehicleMater.task_code = sch_base_task.task_code
-        where md_pb_vehicleMater.vehicle_code in
+        where md_pb_vehicleMater.id in
-        <foreach collection="vehicles" item="vehicle_code" open="(" close=")" separator=",">
+        <foreach collection="vehicles" item="vehicle_id" open="(" close=")" separator=",">
-            #{vehicle_code}
+            #{vehicle_id}
         </foreach>
     </select>
 </mapper>

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java

@@ -87,11 +87,11 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
 
 
     @Override
-    public List<Map> getByVehicle(String vehicle_code) {
+    public List<Map> getByVehicle(String vehicle_id) {
-        if (StringUtils.isEmpty(vehicle_code)) {
+        if (StringUtils.isEmpty(vehicle_id)) {
             return new ArrayList<>();
         }
-        return this.baseMapper.getByVehicle(ListOf.of(vehicle_code.split(",")));
+        return this.baseMapper.getByVehicle(ListOf.of(vehicle_id.split(",")));
     }
 
     @Override
@@ -220,12 +220,13 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
             case "rm":
                 return dicisionStruct(struct_code, stIvtStructattr, task);
             case "rzd":
+                JSONObject struct = dicisionStruct(struct_code, stIvtStructattr, task);
                 iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
                     .set("update_time", DateUtil.now())
                     .set("vehicle_code", null)
                     .set("lock_type", StatusEnum.LOCK.code("无锁"))
                     .eq("struct_code", task.getPoint_code2()));
-                return dicisionStruct(struct_code, stIvtStructattr, task);
+                return struct;
             case "czd":
                 moveTask(task_code, struct_code, stIvtStructattr);
                 break;

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/controller/PalletStIvtIostorinvController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.utils.MapOf;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.pda_manage.palletio.service.PalletIostorinvService;
 import org.nl.wms.stor_manage.io.service.dto.StorInvQuery;
@@ -18,6 +19,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,7 +34,11 @@ import java.util.Map;
 @RestController
 @RequestMapping("api/pdaPalletIostorinv")
 public class PalletStIvtIostorinvController {
-
+    public static Map<String,String> Pallet_OutPoint =
+            MapOf.of("一楼左侧","1119"
+                    ,"一楼右侧","1131"
+                    ,"二楼左侧","2115"
+                    ,"二楼右侧","2127","三楼出库点","3110");
     @Autowired
     private PalletIostorinvService palletIostorinvService;
 
@@ -51,6 +57,17 @@ public class PalletStIvtIostorinvController {
         palletIostorinvService.outStorage(form);
         return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
     }
+    @RequestMapping("targetPoint")
+    @SaIgnore
+    @Log("手持托盘出库点")
+    public ResponseEntity<Object> targetPoint() {
+        List<Object> result = new ArrayList<>();
+        for (String label : Pallet_OutPoint.keySet()) {
+            String value = Pallet_OutPoint.get(label);
+            result.add(MapOf.of("label",value,value));
+        }
+        return new ResponseEntity<>(TableDataInfo.build(result),HttpStatus.OK);
+    }
 
 }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java

@@ -0,0 +1,41 @@
+package org.nl.wms.pda_manage.pick;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.alibaba.fastjson.JSONObject;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 出入库单主表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2024-03-28
+ */
+@RestController
+@RequestMapping("api/pda/pick")
+public class PdaPickController {
+
+    @Autowired
+    private IMdGruopDickService iMdGruopDickService;
+
+
+    @PostMapping("savePickTask")
+    @SaIgnore
+    @Log("手持拣选确认")
+    public ResponseEntity<Object> inStorage(@RequestBody JSONObject form) {
+        iMdGruopDickService.groupDick(form);
+        return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
+    }
+}
+

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/HandLoginController.java

@@ -6,6 +6,7 @@ package org.nl.wms.system_manage.controller.login;
 
 
  import lombok.RequiredArgsConstructor;
+ import org.nl.common.TableDataInfo;
  import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSONObject;
@@ -41,7 +42,7 @@ public class HandLoginController {
     @Log("手持登陆验证")
     //("手持登陆验证")
     public ResponseEntity<Object> handlogin(@RequestBody Map<String, String> whereJson) {
-        return ResponseEntity.ok(handLoginService.handleLogin(whereJson));
+        return new ResponseEntity<>(TableDataInfo.buildJson(handLoginService.handleLogin(whereJson)),HttpStatus.OK);
     }
 
     //("修改密码")

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/secutiry/impl/HandLoginServiceImpl.java

@@ -82,7 +82,7 @@ public class HandLoginServiceImpl implements HandLoginService {
             put("user", jsonObject);
         }};
         redisUtils.set("pe-satoken", StpUtil.getTokenValue(), StpUtil.getTokenTimeout());
-        return resultJson;
+        return authInfo;
 
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/dto/CurrentUser.java

@@ -17,7 +17,6 @@ import java.util.List;
  */
 @Data
 public class CurrentUser implements Serializable {
-    @JsonSerialize(using = ToStringSerializer.class)
     private String id;
 
     //账号

wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -79,8 +79,8 @@
     <!--开发环境:打印控制台-->
     <springProfile name="dev3">
         <root level="info">
-            <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="CONSOLE"/>
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>

wms_pro/hd/pom.xml

@@ -3,12 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-<!--    <parent>-->
+    <parent>
-<!--        <groupId>org.springframework.boot</groupId>-->
+        <groupId>org.springframework.boot</groupId>
-<!--        <artifactId>spring-boot-starter-parent</artifactId>-->
+        <artifactId>spring-boot-starter-parent</artifactId>
-<!--        <version>2.6.2</version>-->
+        <version>2.6.2</version>
-<!--        <relativePath/> &lt;!&ndash; lookup parent from repository &ndash;&gt;-->
+        <relativePath/> <!-- lookup parent from repository -->
-<!--    </parent>-->
+    </parent>
     <groupId>org.nl</groupId>
     <artifactId>wms</artifactId>
     <packaging>pom</packaging>

wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue

@@ -364,7 +364,7 @@ export default {
 
     queryTableDdis() {
       if (this.currentDtl !== null && this.currentDtl.vehicle_code != null) {
-        crudProduct.getVehicleTask({'vehicle_code': this.currentDtl.vehicle_code}).then(res => {
+        crudProduct.getVehicleTask({'vehicle_id': this.currentDtl.vehicle_id}).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []

wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue

@@ -237,7 +237,7 @@ export default {
     },
     queryTableDdis() {
       if (this.currentdtl !== null && this.currentdtl.vehicle_code!=null) {
-        crudProductIn.getVehicleTask({ 'vehicle_code': this.currentdtl.vehicle_code }).then(res => {
+        crudProductIn.getVehicleTask({ 'vehicle_id': this.currentdtl.vehicle_id }).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []

wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue

@@ -210,12 +210,21 @@ export default {
       if (current !== null) {
         this.tabledis = []
         this.currentdtl = current
-        this.divdis(this.currentdtl)
+        this.queryTableDdis()
       } else {
         this.tabledis = []
         this.currentdtl = {}
       }
     },
+    queryTableDdis() {
+      if (this.currentdtl !== null && this.currentdtl.vehicle_code!=null) {
+        crudProductIn.getVehicleTask({ 'vehicle_id': this.currentdtl.vehicle_id }).then(res => {
+          this.tabledis = res
+        }).catch(() => {
+          this.tabledis = []
+        })
+      }
+    },
     invtypeFormat(row, column) {
       for (const item of this.billtypelist) {
         if (item.code === row.source_bill_type) {

wms_pro/qd/src/views/wms/stor_manage/out/storinvout.js

@@ -67,6 +67,14 @@ export function taskOpen(data) {
   })
 }
 
+export function getVehicleTask(data) {
+  return request({
+    url: '/api/schBaseTask/getVehicleTask',
+    method: 'post',
+    data
+  })
+}
+
 export function cancelMst(id) {
   return request({
     url: "/api/stIvtIostorinvOut/cancelMst/" + id,
@@ -84,4 +92,5 @@ export default {
   divDis,
   cancelMst,
   taskOpen,
+  getVehicleTask
 }

wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/ViewDialog.vue

@@ -266,7 +266,7 @@ export default {
       })
     },
     queryTableDis(currentDtl) {
-      crudStructattr.getVehicleTask({ 'vehicle_code': currentDtl.vehicle_code }).then(res => {
+      crudStructattr.getVehicleTask({ 'vehicle_id': currentDtl.vehicle_id }).then(res => {
           this.tabledis = res
         })
     }

wms_pro/qd/src/views/wms/stor_manage/warehouse/move/ViewDialog.vue

@@ -250,7 +250,7 @@ export default {
       })
     },
     queryTableDis(currentDtl) {
-      crudStructattr.getVehicleTask({ 'vehicle_code': currentDtl.vehicle_code }).then(res => {
+      crudStructattr.getVehicleTask({ 'vehicle_id': currentDtl.vehicle_id }).then(res => {
           this.tabledis = res
         })
     }