diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index bb2c0dc5b..ff60024f4 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -212,11 +212,15 @@ public class LoginController extends BaseController { loginResponse.setEmployeeName(authAdmin.getEmployeeName()); loginResponse.setToken(token); loginResponse.setDept(authAdmin.getLocDeptCode()); - + loginResponse.setInvCode(authAdmin.getLocInvCode()); DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocDeptCode()); if (deptEntity != null) { loginResponse.setDeptName(deptEntity.getName()); } + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocInvCode()); + if (invWarehouseEntity != null) { + loginResponse.setInvName(invWarehouseEntity.getName()); + } List sysMenus = menuService.selectMenuList(authAdmin.getId()); // .stream().filter(item -> item.getMenuName().equals("单据管理")).findFirst().get().getChildren(). List menus = sysMenus.stream().filter( diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 5ac74236b..dfc4a5476 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -328,8 +328,20 @@ public class IoOrderController extends BaseController { @PostMapping("warehouse/inout/saveOrderWeb") @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { - System.out.println(addOrderRequest.toString()); IoOrderEntity orderEntity = new IoOrderEntity(); + + if (addOrderRequest.getWorkPlaceCode() != null) { + if (IntUtil.value(addOrderRequest.getInoutType()) == 2) { + addOrderRequest.setAction(ConstantType.SPLIT_RETURN); + } else { + addOrderRequest.setAction(ConstantType.SPLIT_OUT); + } + addOrderRequest.setFromCorp(ConstantType.SPLIT_CORP); + AuthAdmin authAdmin = getUser(); + addOrderRequest.setDeptCode(authAdmin.getLocDeptCode()); + addOrderRequest.setInvCode(authAdmin.getLocInvCode()); + } + if (StrUtil.isEmpty(addOrderRequest.getAction())) return ResultVOUtils.error(500, "单据类型不能为空"); @@ -338,6 +350,8 @@ public class IoOrderController extends BaseController { if (addOrderRequest.getOrderType() != null) { orderEntity.setOrderType(addOrderRequest.getOrderType()); } + + orderEntity.setFromCorp(ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum())); orderEntity.setAction(addOrderRequest.getAction()); orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index a930c9fa3..b31603b8a 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -56,4 +56,5 @@ public class AddOrderRequest { */ private String splitBusType; private String splitType; + private Integer inoutType; } diff --git a/src/main/java/com/glxp/api/res/auth/LoginResponse.java b/src/main/java/com/glxp/api/res/auth/LoginResponse.java index f720fec85..5276ee877 100644 --- a/src/main/java/com/glxp/api/res/auth/LoginResponse.java +++ b/src/main/java/com/glxp/api/res/auth/LoginResponse.java @@ -15,6 +15,9 @@ public class LoginResponse { private String dept; private String deptName; + private String invCode; + private String invName; + private String employeeName; private String userName; /** diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 76aa51127..385fd4b2a 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -283,7 +283,7 @@ public class IoOrderResponse { private String splitBusTypeName; - + private Integer productType; /** * 业务类型名称 */ diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 3fa38cd6c..815fbe996 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: 123456 + password: Glxp@6066 hikari: connection-timeout: 60000 maximum-pool-size: 20 diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 5661c5594..95bb6a352 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -23,15 +23,17 @@ ico.splitMsg, ico.fromCorpName, ico.tagMsg, - sys_workplace_document.busName busTypeName, - thr_bustype_origin.name actionName, + sys_workplace_document.busName busTypeName, + thr_bustype_origin.name actionName, sw.workplaceName, ico.id, ico.orderTime, ico.uploadStatus, ico.uploadError, ico.errorMsg, - row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence + row_number() over ( order by case + when ico.orderTime is null then ico.createTime + else ico.orderTime end desc ) as orderSequence FROM io_collect_order ico left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode left join thr_bustype_origin on sys_workplace_document.documentTypeCode = thr_bustype_origin.action @@ -49,7 +51,7 @@ - AND ( fromCorp LIKE concat('%', #{fromCorp}, '%') or fromCorpName LIKE concat('%', #{fromCorp}, '%') ) + AND (fromCorp LIKE concat('%', #{fromCorp}, '%') or fromCorpName LIKE concat('%', #{fromCorp}, '%')) AND fromType LIKE concat('%', #{fromType}, '%') @@ -65,7 +67,8 @@ - AND ico.workPlaceCode is not null and ico.workPlaceCode not in (#{excludeWorkCode}) + AND ico.workPlaceCode is not null + and ico.workPlaceCode not in (#{excludeWorkCode}) @@ -76,10 +79,10 @@ AND ( - ico.billNo like concat( #{unionKey}) + ico.billNo like concat(#{unionKey}) or ico.fromCorp like concat(#{unionKey}) or ico.fromCorpName like concat(#{unionKey}) - or ico.backupOrderRemark1 like concat( #{unionKey}) + or ico.backupOrderRemark1 like concat(#{unionKey}) or ico.backupOrderRemark2 like concat(#{unionKey}) or ico.backupOrderRemark3 like concat(#{unionKey}) or ico.backupOrderRemark4 like concat(#{unionKey}) @@ -107,10 +110,10 @@ - and ico.invAlert =#{invAlert} + and ico.invAlert = #{invAlert} - and ico.invAlert in (0,1) + and ico.invAlert in (0, 1) and ico.invAlert in @@ -123,12 +126,12 @@ and (ico.billNo like concat('%', #{keyWords}, '%') - or ico.fromCorp like concat('%', #{keyWords}, '%') - or ico.fromCorpName like concat('%', #{keyWords}, '%') - or ico.workPlaceCode like concat('%', #{keyWords}, '%') - or ico.busType like concat('%', #{keyWords}, '%') - or ico.fromCorpName like concat('%', #{keyWords}, '%') - or ico.fromType like concat('%', #{keyWords}, '%')) + or ico.fromCorp like concat('%', #{keyWords}, '%') + or ico.fromCorpName like concat('%', #{keyWords}, '%') + or ico.workPlaceCode like concat('%', #{keyWords}, '%') + or ico.busType like concat('%', #{keyWords}, '%') + or ico.fromCorpName like concat('%', #{keyWords}, '%') + or ico.fromType like concat('%', #{keyWords}, '%')) AND ico.shipperName LIKE concat('%', #{shipperName}, '%') @@ -136,19 +139,18 @@ AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%') - + = DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S') - ]]> + and ico.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S') + ]]> - + + and ico.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S') + ]]> - GROUP BY - ico.billNo + GROUP BY ico.billNo order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc @@ -178,7 +180,6 @@ TRUNCATE io_collect_order_biz_origin; TRUNCATE io_collect_order_backup; TRUNCATE io_collect_order_biz_backup; -