diff --git a/wms_pro/hd/nladmin-system/pom.xml b/wms_pro/hd/nladmin-system/pom.xml index a1161ade..5f561df4 100644 --- a/wms_pro/hd/nladmin-system/pom.xml +++ b/wms_pro/hd/nladmin-system/pom.xml @@ -33,8 +33,6 @@ dynamic-tp-spring-boot-starter-adapter-webserver 1.1.7 - - org.codehaus.groovy groovy-all @@ -291,6 +289,12 @@ com.yomahub tlog-all-spring-boot-starter 1.5.0 + + + tlog-hutool-http + com.yomahub + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java index a564271c..ba0ad790 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/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); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java index 35755244..46f37edb 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SecurityUtils.java +++ b/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; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml index f2218f56..d808c3ab 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml +++ b/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 - - #{vehicle_code} + where md_pb_vehicleMater.id in + + #{vehicle_id} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index a24716ce..bd4896ef 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/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 getByVehicle(String vehicle_code) { - if (StringUtils.isEmpty(vehicle_code)) { + public List getByVehicle(String vehicle_id) { + 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() - .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); + .set("update_time", DateUtil.now()) + .set("vehicle_code", null) + .set("lock_type", StatusEnum.LOCK.code("无锁")) + .eq("struct_code", task.getPoint_code2())); + return struct; case "czd": moveTask(task_code, struct_code, stIvtStructattr); break; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/controller/PalletStIvtIostorinvController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/controller/PalletStIvtIostorinvController.java index adbf28c9..260114c5 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/controller/PalletStIvtIostorinvController.java +++ b/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 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 targetPoint() { + List 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); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java new file mode 100644 index 00000000..df6c8220 --- /dev/null +++ b/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; + +/** + *

+ * 出入库单主表 前端控制器 + *

+ * + * @author generator + * @since 2024-03-28 + */ +@RestController +@RequestMapping("api/pda/pick") +public class PdaPickController { + + @Autowired + private IMdGruopDickService iMdGruopDickService; + + + @PostMapping("savePickTask") + @SaIgnore + @Log("手持拣选确认") + public ResponseEntity inStorage(@RequestBody JSONObject form) { + iMdGruopDickService.groupDick(form); + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + } +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/HandLoginController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/HandLoginController.java index 4374152a..806d1751 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/HandLoginController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/HandLoginController.java @@ -6,7 +6,8 @@ package org.nl.wms.system_manage.controller.login; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; + 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 handlogin(@RequestBody Map whereJson) { - return ResponseEntity.ok(handLoginService.handleLogin(whereJson)); + return new ResponseEntity<>(TableDataInfo.buildJson(handLoginService.handleLogin(whereJson)),HttpStatus.OK); } //("修改密码") diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/secutiry/impl/HandLoginServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/secutiry/impl/HandLoginServiceImpl.java index 54f4ac24..834959e4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/secutiry/impl/HandLoginServiceImpl.java +++ b/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; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/dto/CurrentUser.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/dto/CurrentUser.java index 1859f4a5..944d474c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/dto/CurrentUser.java +++ b/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; //账号 diff --git a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml index 76dd4c73..2d4dbffe 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -79,8 +79,8 @@ - + diff --git a/wms_pro/hd/pom.xml b/wms_pro/hd/pom.xml index 745fb285..78d2107c 100644 --- a/wms_pro/hd/pom.xml +++ b/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"> 4.0.0 - - - - - - + + org.springframework.boot + spring-boot-starter-parent + 2.6.2 + + org.nl wms pom diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue index c392484a..2dbdee38 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue +++ b/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 = [] diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue index a32b02ab..e4b49470 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue +++ b/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 = [] diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue index 1bfd1a33..b9476658 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue +++ b/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) { diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/storinvout.js b/wms_pro/qd/src/views/wms/stor_manage/out/storinvout.js index 8dc272b3..9ae1d6a8 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/storinvout.js +++ b/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 } diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/ViewDialog.vue index 6790e56a..a5975759 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/ViewDialog.vue +++ b/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 }) } diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/ViewDialog.vue index 228244c2..dee1334b 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/warehouse/move/ViewDialog.vue +++ b/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 }) }