协调平台时间格式问题

test^2
anthonywj 2 years ago
parent c39ffb1587
commit ddc5eab3cd

@ -799,6 +799,7 @@ public class IoCodeTempController extends BaseController {
} else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) { } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
//按指定货位出库 //按指定货位出库
if (StrUtil.isEmpty(codeTempEntity.getWarehouseCode())) { if (StrUtil.isEmpty(codeTempEntity.getWarehouseCode())) {
List<InvPlaceDetailResponse> invProductDetailEntities = invProductDetailService.findByGroupCode(codeTempEntity.getInvCode(), codeTempEntity.getCode(), true); List<InvPlaceDetailResponse> invProductDetailEntities = invProductDetailService.findByGroupCode(codeTempEntity.getInvCode(), codeTempEntity.getCode(), true);
if (CollUtil.isNotEmpty(invProductDetailEntities) && invProductDetailEntities.size() > 1) { if (CollUtil.isNotEmpty(invProductDetailEntities) && invProductDetailEntities.size() > 1) {
BaseResponse baseResponse = ResultVOUtils.error(511, "存在多个货位,请指定当前货位!"); BaseResponse baseResponse = ResultVOUtils.error(511, "存在多个货位,请指定当前货位!");

@ -34,6 +34,7 @@ import com.glxp.api.service.system.SystemPDFModuleService;
import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.service.system.SystemPDFTemplateService;
import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.ThrProductsService;
import com.glxp.api.util.JasperUtils; import com.glxp.api.util.JasperUtils;
import com.glxp.api.util.MsDateUtil;
import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRException;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -246,18 +247,18 @@ public class IoOrderDetailResultController extends BaseController {
//查询第三方产品产品类别 //查询第三方产品产品类别
ThrProductsEntity thrProductsEntity = thrProductsService.filterThrProductsByMainId(ioOrderDetailResultResponse.getBindRlFk() + ""); ThrProductsEntity thrProductsEntity = thrProductsService.filterThrProductsByMainId(ioOrderDetailResultResponse.getBindRlFk() + "");
//查询发票信息 //查询发票信息
String dateStr=""; String dateStr = "";
List<String> encodeList=new ArrayList<>(); List<String> encodeList = new ArrayList<>();
IoOrderInvoiceRequest ioOrderInvoiceRequest=new IoOrderInvoiceRequest(); IoOrderInvoiceRequest ioOrderInvoiceRequest = new IoOrderInvoiceRequest();
ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + ""); ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + "");
ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk()); ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk());
ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo()); ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo());
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest); List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest);
for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) { for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) {
encodeList.add(ioOrderInvoiceEntity.getInvoiceEncode()); encodeList.add(ioOrderInvoiceEntity.getInvoiceEncode());
} }
String encode=String.join(",", encodeList); String encode = String.join(",", encodeList);
if(CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)){ if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dateStr = sdf.format(ioOrderInvoiceEntityList.get(0).getCreateTime()); 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("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName());
ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction()); ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction());
ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime())); 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("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb());
} }
ioOrderDetailResultData.put("invoiceEncode", encode); ioOrderDetailResultData.put("invoiceEncode", encode);
@ -317,7 +318,7 @@ public class IoOrderDetailResultController extends BaseController {
for (CptTraceOrderResponse cptTraceOrderResponse : cptTraceOrderResponses) { for (CptTraceOrderResponse cptTraceOrderResponse : cptTraceOrderResponses) {
CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse(); CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse();
cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo()); 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()); cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType());
if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode())) if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode()))

@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver 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 username: root
password: 123456 password: 123456
hikari: hikari:

Loading…
Cancel
Save