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 e0d4f4148..4445f7f67 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -799,6 +799,7 @@ public class IoCodeTempController extends BaseController { } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) { //按指定货位出库 if (StrUtil.isEmpty(codeTempEntity.getWarehouseCode())) { + List invProductDetailEntities = invProductDetailService.findByGroupCode(codeTempEntity.getInvCode(), codeTempEntity.getCode(), true); if (CollUtil.isNotEmpty(invProductDetailEntities) && invProductDetailEntities.size() > 1) { BaseResponse baseResponse = ResultVOUtils.error(511, "存在多个货位,请指定当前货位!"); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 6bdc3790f..997223111 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -34,6 +34,7 @@ import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.JasperUtils; +import com.glxp.api.util.MsDateUtil; import net.sf.jasperreports.engine.JRException; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Value; @@ -246,18 +247,18 @@ public class IoOrderDetailResultController extends BaseController { //查询第三方产品产品类别 ThrProductsEntity thrProductsEntity = thrProductsService.filterThrProductsByMainId(ioOrderDetailResultResponse.getBindRlFk() + ""); //查询发票信息 - String dateStr=""; - List encodeList=new ArrayList<>(); - IoOrderInvoiceRequest ioOrderInvoiceRequest=new IoOrderInvoiceRequest(); + String dateStr = ""; + List encodeList = new ArrayList<>(); + IoOrderInvoiceRequest ioOrderInvoiceRequest = new IoOrderInvoiceRequest(); ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + ""); ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk()); ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo()); - List ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest); + List ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest); for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) { encodeList.add(ioOrderInvoiceEntity.getInvoiceEncode()); } - String encode=String.join(",", encodeList); - if(CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)){ + String encode = String.join(",", encodeList); + if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); dateStr = sdf.format(ioOrderInvoiceEntityList.get(0).getCreateTime()); } @@ -284,7 +285,7 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName()); ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction()); ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime())); - if(thrProductsEntity!=null){ + if (thrProductsEntity != null) { ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb()); } ioOrderDetailResultData.put("invoiceEncode", encode); @@ -317,7 +318,7 @@ public class IoOrderDetailResultController extends BaseController { for (CptTraceOrderResponse cptTraceOrderResponse : cptTraceOrderResponses) { CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse(); cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo()); - cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime())); + cptTraceResultResponse.setBillDate(MsDateUtil.formatDate(cptTraceOrderResponse.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType()); if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode())) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9463b3440..86bb3fdf0 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_zyy?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_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: