From ae81fe0a4b3368e072db02da8921750daab5de0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 18 Jul 2023 09:27:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b9dfaf4b8..3114d5c6a 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://192.168.0.66:3364/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 20 From f98133e1007e24e10078fce46377d8a7357c7bb8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 18 Jul 2023 15:58:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=94=A8=E5=86=85?= =?UTF-8?q?=E9=83=A8=E7=A0=81=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=8B=A8=E5=87=BA?= =?UTF-8?q?=E5=BA=93=20=E6=8F=90=E7=A4=BA=E5=BA=93=E5=AD=98=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 2 +- .../api/service/inv/impl/InvProductDetailServiceImpl.java | 2 +- src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index b8a118b18..b3d011972 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -630,7 +630,7 @@ public class IoCodeTempController extends BaseController { } else if (StrUtil.isNotEmpty(addOrderRequest.getSelectSupId())) { unitFk = addOrderRequest.getSelectSupId(); } - //产品是否可以以使用单元入库 + //产品是否禁用 udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeEnttity.getNameCode(), false); if (udiRelevanceResponses.size() >= 1) { if (udiRelevanceResponse == null) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java index fe43bd0ad..154224408 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java @@ -182,7 +182,7 @@ public class InvProductDetailServiceImpl implements InvProductDetailService { } List datas = invProductDetailDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) - .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode) + .and(i-> i.isNull(StrUtil.isEmpty(batchNo), "batchNo").or().eq("batchNo","")).eq(StrUtil.isNotEmpty(supId), "supId", supId).eq("deptCode", deptCode).eq("invCode", invCode) .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) ); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 4569d2fce..912ed505d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1282,7 +1282,7 @@ isLock, lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, - remark, useExpireTime, dispatch, groupBuy，needCert) + remark, useExpireTime, dispatch, groupBuy,needCert) values @@ -1308,7 +1308,7 @@ #{item.modifyTime}, #{item.createUser}, #{item.updateUser}, - #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}，#{item.needCert}) + #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy},#{item.needCert}) From a9f47f41b98bc22493ea4586d79712530ef19e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 18 Jul 2023 16:31:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/inout/IoOrderController.java | 4 ++++ 1 file changed, 4 insertions(+) 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 8014d161a..69871756e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -332,6 +332,10 @@ public class IoOrderController extends BaseController { public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); + //补充备注 + if(addOrderRequest.getRemark()!=null){ + orderEntity.setRemark(addOrderRequest.getRemark()); + } BaseResponse tempResponse = checkSubmitEnable(orderEntity); if (tempResponse != null) return tempResponse; From ea026d8f2678116477dd2c618cc27a293dc6caf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Tue, 18 Jul 2023 16:53:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=20=E4=B8=9A=E5=8A=A1=E5=8D=95=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=A1=A5=E5=8D=95-=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94?= =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E6=B2=A1=E6=9C=89=E6=8E=A8=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/IoPurChangeService.java | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index bb938275e..4d537834b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -30,10 +30,9 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.awt.geom.QuadCurve2D; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; @Service @@ -500,6 +499,7 @@ public class IoPurChangeService { //对计划单里面的供应商进行分组 Map> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGDD); + Integer beforeTime = basicBusTypeChangeEntity.getBeforeTime(); String billNo = ""; if (purOrderEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED) { for (Map.Entry> m : map.entrySet()) { @@ -518,9 +518,24 @@ public class IoPurChangeService { ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_PROCESS); } - ioOrderEntity.setOrderType(1); - ioOrderEntity.setCreateTime(new Date()); + + //根据单据设置时间间隔推移 + Date currentTime = new Date();//当前日期 + Calendar cal =Calendar.getInstance(); + cal.setTime(currentTime); + cal.add(Calendar.HOUR_OF_DAY,beforeTime); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//定义新的日期格式 + String dateString = formatter.format(cal.getTime()); + Date date = null; + try { + date = formatter.parse(dateString);//parse():String--->date + System.out.println("转化为date格式：" + date); + } catch (ParseException e) { + e.printStackTrace(); + } + + ioOrderEntity.setCreateTime(date); // ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); ioOrderEntity.setUpdateTime(new Date()); // ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());