From d3500793420a26cd1ea69f01f8e92e02c6d1e81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Sep 2025 09:24:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InCostCenterBackController.java | 1 - .../controller/InProduceBackController.java | 76 ++++++----- .../controller/InProduceOrderController.java | 25 ++-- .../controller/InPurchaseController.java | 1 + .../admin/controller/NormalPGIController.java | 14 +- .../pojo/dto/SAPMaterialInfoInOrderDTO.java | 5 + .../service/NormalPGIControllerService.java | 7 +- .../wms/admin/service/SAPCommonService.java | 37 +++--- .../nflg/wms/admin/service/SapService.java | 8 +- .../dto/DepartmentMaterialRequisitionDTO.java | 13 +- .../dto/DepartmentMaterialReturnSlipDTO.java | 12 +- .../common/pojo/dto/SRMLineVOListItem.java | 3 +- .../common/pojo/dto/SRMOrderReceiveDTO.java | 52 ++++++++ .../dto/SRMQualityInspectionResultDTO.java | 120 ++++++++++++++++++ .../wms/common/pojo/dto/TransferOrderDTO.java | 12 +- .../common/pojo/qo/OutCostcenterSearchQO.java | 5 + .../common/pojo/qo/SRMOrderReceiveItemQO.java | 2 +- .../wms/common/pojo/qo/SRMOrderReceiveQO.java | 44 +------ .../pojo/qo/SRMQualityInspectionResult.java | 113 +---------------- .../common/pojo/qo/SrmMaterialReceiptQO.java | 4 +- .../pojo/qo/TransferFactorySearchQO.java | 5 + .../pojo/vo/InCostcenterBackInfoVO.java | 5 + .../common/pojo/vo/InCostcenterBackVO.java | 5 + .../common/pojo/vo/InProduceBackItemVO.java | 5 + .../pojo/vo/InProduceBackTicketItemVO.java | 5 + .../wms/common/pojo/vo/InProduceBackVO.java | 5 + .../wms/common/pojo/vo/OutProduce1VO.java | 5 + .../nflg/wms/common/pojo/vo/Zwm3a07VO.java | 9 ++ .../nflg/wms/common/pojo/vo/Zwm3a09VO.java | 18 +++ .../nflg/wms/common/util/DateTimeUtil.java | 3 +- .../wms/repository/entity/WmsSrmOrder.java | 4 +- .../mapper/WmsPoReceiptItemMapper.xml | 15 +-- .../resources/mapper/WmsQcReceiveMapper.xml | 12 +- .../resources/mapper/WmsSrmOrderMapper.xml | 10 +- .../srm/receive/controller/SRMController.java | 95 +++++++------- .../src/main/resources/application.yml | 2 +- 36 files changed, 430 insertions(+), 327 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMOrderReceiveDTO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMQualityInspectionResultDTO.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java index 3d46de2c..a31cb296 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java @@ -52,7 +52,6 @@ import java.util.stream.Collectors; @RequestMapping("/in/costcenter") public class InCostCenterBackController extends BaseController { - @Resource private SapService sapService; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java index 451e7aaa..0501b32f 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java @@ -2,9 +2,7 @@ package com.nflg.wms.admin.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.nflg.wms.admin.pojo.document.InMaterialScanRecord; import com.nflg.wms.admin.pojo.dto.PdfPageDTO; @@ -77,43 +75,43 @@ public class InProduceBackController extends BaseController { */ @PostMapping("searchSAP") public ApiResult> searchSAP(@Valid @RequestBody Zwm3a09QO request) { -// return ApiResult.success(sapService.zwm3a09(request)); - List vos = new ArrayList<>(); - for (int i = 0, count = RandomUtil.randomInt(3, 30); i < count; i++) { - vos.add(new Zwm3a09VO() - .setBdter(DateUtil.format(RandomUtil.randomDate(DateUtil.date(), DateField.DAY_OF_YEAR, 1, 300), "yyyy-MM-dd")) - .setAufnr(RandomUtil.randomNumbers(10)) - .setKtext(RandomUtil.randomString(10)) - .setPlnbez(RandomUtil.randomString(10)) - .setMaktx(RandomUtil.randomString(10)) - .setLgpbe(RandomUtil.randomString(4)) - .setMatnr(RandomUtil.randomString(11)) - .setName(RandomUtil.randomString(10)) - .setQlsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setSqsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setSqsl2(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setSqsl3(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setBdmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setLabst(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setKcqls(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setLgort2(RandomUtil.randomString(4)) - .setMeins(RandomUtil.randomString(4)) - .setEkgrp(RandomUtil.randomString(4)) - .setDispo(RandomUtil.randomString(4)) - .setRsnum(RandomUtil.randomNumbers(10)) - .setMaktx2(RandomUtil.randomString(10)) - .setVornr(RandomUtil.randomNumbers(10)) - .setSernr(RandomUtil.randomNumbers(10)) - .setJtsn(RandomUtil.randomNumbers(10)) - .setCusn(RandomUtil.randomNumbers(10)) - .setDwerk(RandomUtil.randomString(4)) - .setRsnum2(RandomUtil.randomNumbers(10)) - .setRspos(RandomUtil.randomNumbers(10)) - .setEnmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setInsme(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - ); - } - return ApiResult.success(vos); + return ApiResult.success(sapService.zwm3a09(request)); +// List vos = new ArrayList<>(); +// for (int i = 0, count = RandomUtil.randomInt(3, 30); i < count; i++) { +// vos.add(new Zwm3a09VO() +// .setBdter(DateUtil.format(RandomUtil.randomDate(DateUtil.date(), DateField.DAY_OF_YEAR, 1, 300), "yyyy-MM-dd")) +// .setAufnr(RandomUtil.randomNumbers(10)) +// .setKtext(RandomUtil.randomString(10)) +// .setPlnbez(RandomUtil.randomString(10)) +// .setMaktx(RandomUtil.randomString(10)) +// .setLgpbe(RandomUtil.randomString(4)) +// .setMatnr(RandomUtil.randomString(11)) +// .setName(RandomUtil.randomString(10)) +// .setQlsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setSqsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setSqsl2(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setSqsl3(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setBdmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setLabst(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setKcqls(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setLgort2(RandomUtil.randomString(4)) +// .setMeins(RandomUtil.randomString(4)) +// .setEkgrp(RandomUtil.randomString(4)) +// .setDispo(RandomUtil.randomString(4)) +// .setRsnum(RandomUtil.randomNumbers(10)) +// .setMaktx2(RandomUtil.randomString(10)) +// .setVornr(RandomUtil.randomNumbers(10)) +// .setSernr(RandomUtil.randomNumbers(10)) +// .setJtsn(RandomUtil.randomNumbers(10)) +// .setCusn(RandomUtil.randomNumbers(10)) +// .setDwerk(RandomUtil.randomString(4)) +// .setRsnum2(RandomUtil.randomNumbers(10)) +// .setRspos(RandomUtil.randomNumbers(10)) +// .setEnmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setInsme(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// ); +// } +// return ApiResult.success(vos); } /** diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 3412ad10..efaa47df 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.nflg.wms.admin.pojo.document.InMaterialScanRecord; import com.nflg.wms.admin.pojo.dto.PdfPageDTO; @@ -98,18 +97,18 @@ public class InProduceOrderController extends BaseController { */ @GetMapping("searchFromSAP") public ApiResult searchFromSAP(@Valid @RequestParam @NotBlank String no){ -// return ApiResult.success(sapService.zwm00Mb007(no)); - return ApiResult.success(new ZWM00MB007DTO() - .setAufnr(RandomUtil.randomNumbers(10)) - .setMatnr(RandomUtil.randomString(11)) - .setMaktx(RandomUtil.randomString(20)) - .setLgort(RandomUtil.randomNumbers(4)) - .setPwerk("1010") - .setPsmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) - .setMeins(RandomUtil.randomString(2)) - .setWemng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50"))) - .setWshsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50"))) - ); + return ApiResult.success(sapService.zwm00Mb007(no)); +// return ApiResult.success(new ZWM00MB007DTO() +// .setAufnr(RandomUtil.randomNumbers(10)) +// .setMatnr(RandomUtil.randomString(11)) +// .setMaktx(RandomUtil.randomString(20)) +// .setLgort(RandomUtil.randomNumbers(4)) +// .setPwerk("1010") +// .setPsmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100"))) +// .setMeins(RandomUtil.randomString(2)) +// .setWemng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50"))) +// .setWshsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50"))) +// ); } // /** diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InPurchaseController.java index 2e4a8540..b0811455 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InPurchaseController.java @@ -153,6 +153,7 @@ public class InPurchaseController extends BaseController { return ApiResult.success(new OutProduce1VO() .setId(order.getId()) .setEbeln(order.getExternalOrderNo()) + .setSupplierName(order.getSupplierName()) .setItems(datas.stream() .map(item -> new OutProduceItemVO() .setEbelp(item.getRowNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 4fe79e65..f1f3bda0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -6,14 +6,15 @@ package com.nflg.wms.admin.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateTime; import cn.hutool.core.util.IdUtil; import com.nflg.wms.admin.pojo.document.SrmMaterialReceiptScanCodes; -import com.nflg.wms.admin.pojo.dto.*; +import com.nflg.wms.admin.pojo.dto.QCMaterialSyncDTO; +import com.nflg.wms.admin.pojo.dto.ZWM3A17DTO; +import com.nflg.wms.admin.pojo.dto.ZWM3A17Item1DTO; +import com.nflg.wms.admin.pojo.dto.ZWM3A17Item2DTO; import com.nflg.wms.admin.repository.SrmMaterialReceiptScanCodesRepository; import com.nflg.wms.admin.service.NormalPGIControllerService; import com.nflg.wms.admin.service.SAPCommonService; -import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.*; @@ -22,6 +23,7 @@ import com.nflg.wms.common.pojo.qo.PoReceiveTaskItemConfirmQO; import com.nflg.wms.common.pojo.qo.SRMOrderSearchQO; import com.nflg.wms.common.pojo.qo.SrmMaterialReceiptQO; import com.nflg.wms.common.pojo.vo.*; +import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.*; @@ -31,10 +33,10 @@ import com.nflg.wms.starter.annotation.ApiMark; import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.apache.commons.lang3.tuple.Triple; -import org.redisson.api.queue.FailedAckArgs; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; @@ -459,7 +461,7 @@ public class NormalPGIController extends BaseController { srmItem.setSerialNum(code.getSerialNumbers()); srmItem.setLineNumber(Integer.valueOf(item.getLineNumber())); srmItem.setNoteNum(item.getNoteNum()); - srmItem.setReceivedDate(DateTime.now()); + srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); srmItem.setInspectionFlag("Y"); pushDto.getContent().getLineVOList().add(srmItem); }); @@ -475,7 +477,7 @@ public class NormalPGIController extends BaseController { srmItem.setSerialNum(""); srmItem.setLineNumber(Integer.valueOf(item.getLineNumber())); srmItem.setNoteNum(item.getNoteNum()); - srmItem.setReceivedDate(DateTime.now()); + srmItem.setReceivedDate(DateTimeUtil.format(LocalDate.now(), "yyyy-MM-dd")); srmItem.setInspectionFlag("Y"); pushDto.getContent().getLineVOList().add(srmItem); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java index 443f7016..95e2beb0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java @@ -1,5 +1,6 @@ package com.nflg.wms.admin.pojo.dto; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -32,6 +33,10 @@ public class SAPMaterialInfoInOrderDTO { */ private String ebelp; + public String getEbelp() { + return StrUtil.removeAllPrefix(ebelp, "0"); + } + /** * 物料号 */ diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java index f7f4ea41..4e9f4afc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java @@ -1,11 +1,9 @@ package com.nflg.wms.admin.service; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.lang.Pair; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.nflg.wms.admin.pojo.document.SrmMaterialReceiptScanCodes; import com.nflg.wms.admin.pojo.dto.QCMaterialSyncDTO; import com.nflg.wms.admin.pojo.dto.ZWM3A17DTO; @@ -29,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.client.RestTemplate; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -243,7 +240,6 @@ public class NormalPGIControllerService { if (CollectionUtil.isNotEmpty(srmMaterialReceiptScanCodes)) { srmMaterialReceiptCanCodesRepository.insert(srmMaterialReceiptScanCodes); } -/** 调试暂时关闭 if (CollectionUtil.isNotEmpty(qcMaterialSyncDTOS)) { for (QCMaterialSyncDTO dto : qcMaterialSyncDTOS) { //导入SAP @@ -264,7 +260,6 @@ public class NormalPGIControllerService { } } } - */ } @Transactional @@ -326,6 +321,8 @@ public class NormalPGIControllerService { String token = GetSRMToken(); VUtil.trueThrowBusinessError(token.trim().isEmpty()).throwMessage("获取SRM的TOKEN失败"); + log.info("收货单推送SRM数据：" + JSONUtil.toJsonStr(request)); + // 构建HTTP请求头信息 HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java index 99332a0d..4aabd43a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java @@ -9,7 +9,6 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -23,24 +22,23 @@ public class SAPCommonService { public SAPSyncParamsDTO getMaterialInfoInOrder(String orderNo, String supplierNo, String materialNo) { - SAPSyncParamsDTO dto = new SAPSyncParamsDTO(); - dto.setMaktx("物料描述"); - dto.setEbelp("1"); - dto.setMatnr(materialNo); - dto.setMenge(new BigDecimal(100)); - dto.setWemng(new BigDecimal(10)); - dto.setMeins("PC"); - dto.setEbeln(orderNo); - dto.setTransportNum(new BigDecimal(80)); - dto.setMatkl("物料组"); - dto.setWgbez("物料描述"); - dto.setWerks("1010"); - dto.setLbprt("1"); - dto.setKzkri(""); - dto.setWarehouseNo("122222"); - dto.setBinNos("2121"); - return dto; - /** +// SAPSyncParamsDTO dto = new SAPSyncParamsDTO(); +// dto.setMaktx("物料描述"); +// dto.setEbelp("1"); +// dto.setMatnr(materialNo); +// dto.setMenge(new BigDecimal(100)); +// dto.setWemng(new BigDecimal(10)); +// dto.setMeins("PC"); +// dto.setEbeln(orderNo); +// dto.setTransportNum(new BigDecimal(80)); +// dto.setMatkl("物料组"); +// dto.setWgbez("物料描述"); +// dto.setWerks("1010"); +// dto.setLbprt("1"); +// dto.setKzkri(""); +// dto.setWarehouseNo("122222"); +// dto.setBinNos("2121"); +// return dto; //获取订单信息 SAPMaterialInfoInOrderDTO materialInfoInOrder = CollectionUtil.get(sapService.zim004(orderNo, supplierNo, materialNo), 0); VUtil.trueThrowBusinessError(Objects.isNull(materialInfoInOrder)).throwMessage("无法获取到有效订单信息" + orderNo); @@ -73,7 +71,6 @@ public class SAPCommonService { syncParams.setBinNos(dbWarehouse.getBinNos()); } return syncParams; - */ } } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java index d597f968..b58b64cb 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java @@ -316,7 +316,10 @@ public class SapService { .throwMessage("SAP错误：" + structure.getString("MSG")); JCoTable table = function.getTableParameterList().getTable("T_OUT"); - return JCoUtil.toBeanList(table, SAPMaterialInfoInOrderDTO.class); + log.info("SAP返回: {}", table); + List datas = JCoUtil.toBeanList(table, SAPMaterialInfoInOrderDTO.class); + log.debug("数据:{}", JSONUtil.toJsonStr(datas)); + return datas; } // /** @@ -774,6 +777,9 @@ public class SapService { // 调用SAP RFC函数 JCoFunction function = exec("ZWM3A09", parameters, tables); + VUtil.trueThrowBusinessError(!StrUtil.equals(function.getExportParameterList().getString("E_TYPE"), "S")) + .throwMessage(function.getExportParameterList().getString("E_MSG")); + // 处理返回的OUTPUT1表数据 JCoTable tOut = function.getTableParameterList().getTable("OUTPUT1"); log.info("SAP返回: {}", tOut); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java index 26b88b64..3af7f641 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java @@ -1,6 +1,6 @@ package com.nflg.wms.common.pojo.dto; -import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; import com.nflg.wms.common.util.DateTimeUtil; import lombok.Data; import lombok.experimental.Accessors; @@ -37,10 +37,7 @@ public class DepartmentMaterialRequisitionDTO { private String bdter; public String getBdter() { - if (NumberUtil.isNumber(bdter)) { - return DateTimeUtil.formatFromMillis(bdter); - } - return bdter; + return DateTimeUtil.formatFromMillis(bdter); } /** @@ -88,6 +85,10 @@ public class DepartmentMaterialRequisitionDTO { */ private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + /** * 基本计量单位 */ @@ -141,6 +142,6 @@ public class DepartmentMaterialRequisitionDTO { private String key1; public String getKey1() { - return werks + "|" + getBdter() + "|" + aufnr + "|" + bwart + "|" + rsnum + "|" + mblnr + "|" + kostl; + return werks + "|" + getBdter() + "|" + aufnr + "|" + bwart + "|" + getRsnum() + "|" + mblnr + "|" + kostl; } } \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialReturnSlipDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialReturnSlipDTO.java index 4d6e2dfd..ced0a460 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialReturnSlipDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialReturnSlipDTO.java @@ -1,5 +1,7 @@ package com.nflg.wms.common.pojo.dto; +import cn.hutool.core.util.StrUtil; +import com.nflg.wms.common.util.DateTimeUtil; import lombok.Data; import lombok.experimental.Accessors; @@ -25,6 +27,10 @@ public class DepartmentMaterialReturnSlipDTO { */ private String bdter; + public String getBdter() { + return DateTimeUtil.formatFromMillis(bdter); + } + /** * 物料组 */ @@ -60,6 +66,10 @@ public class DepartmentMaterialReturnSlipDTO { */ private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + /** * 基本计量单位 */ @@ -97,6 +107,6 @@ public class DepartmentMaterialReturnSlipDTO { private String key; public String getKey() { - return this.werks + "|" + this.bdter + "|" + aufnr + "|" + bwart + "|" + rsnum + "|" + kostl + "|" + lgort; + return this.werks + "|" + getBdter() + "|" + aufnr + "|" + bwart + "|" + getRsnum() + "|" + kostl + "|" + lgort; } } \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMLineVOListItem.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMLineVOListItem.java index ed6a417b..aec62d79 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMLineVOListItem.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMLineVOListItem.java @@ -1,6 +1,5 @@ package com.nflg.wms.common.pojo.dto; -import cn.hutool.core.date.DateTime; import lombok.Data; import java.math.BigDecimal; @@ -17,6 +16,6 @@ public class SRMLineVOListItem { private String itemCode; private Integer lineNumber; private String noteNum; - private DateTime receivedDate; + private String receivedDate; private String inspectionFlag; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMOrderReceiveDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMOrderReceiveDTO.java new file mode 100644 index 00000000..421d54ed --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMOrderReceiveDTO.java @@ -0,0 +1,52 @@ +package com.nflg.wms.common.pojo.dto; + +import com.nflg.wms.common.pojo.qo.SRMOrderReceiveItemQO; +import lombok.Data; + +import java.util.List; + +@Data +public class SRMOrderReceiveDTO { + + /** + * 送货单号 + */ + private String noteNum; + + /** + * 公司 + */ + private String ouCode; + + /** + * 工厂 + */ + private String iuCode; + + /** + * 采购组 + */ + private String purchaseGroup; + + /** + * 发货时间 + */ + private String deliveryNoteDate; + + /** + * 运单号 + */ + private String waybillNum; + + /** + * 供应商编号 + */ + private String supplierNum; + + /** + * 供应商名称 + */ + private String supplierName; + + private List ResultSet; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMQualityInspectionResultDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMQualityInspectionResultDTO.java new file mode 100644 index 00000000..a748b176 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMQualityInspectionResultDTO.java @@ -0,0 +1,120 @@ +package com.nflg.wms.common.pojo.dto; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class SRMQualityInspectionResultDTO { + + /** + * 质检单号 + */ + public String inspectionNum; + + /** + * 工厂 + */ + public String factory; + + /** + * 送货数量 + */ + public BigDecimal deliveryQty; + + /** + * 检验结果 + */ + public String inspectionResult; + + /** + * 物料号 + */ + public String itemCode; + + /** + * 供应商代码 + */ + public String supplierNum; + + /** + * 检验类型 + */ + public String inspectionType; + + /** + * 采购单行号 + */ + public String poLineNumber; + + /** + * 检验数量 + */ + public BigDecimal inspectionQty; + + /** + * 物料描述 + */ + public String itemName; + + /** + * 单位 + */ + public String unit; + + /** + * 收货仓库 + */ + public String receivedWarehouse; + + /** + * 不合格原因 + */ + public String unqualifiedReason; + + /** + * 采购订单号 + */ + public String poNum; + + /** + * 物料凭证（收货时SAP返回的凭证） + */ + public String receiveNum; + + /** + * 不合格数量 + */ + public BigDecimal unqualifiedQty; + + /** + * 合格数量合格数量 + */ + public BigDecimal qualifiedQty; + + /** + * 收货时的凭证 + */ + public String materialBatch; + + /** + * 收货时的批次 + */ + public String receiveBatchNum; + + /** + * 收货时的序列号 + */ + public String serialNum; + + + /** + * 送货单行号 + */ + public String lineNumber; + + /** + * 送货单号 + */ + public String noteNum; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java index a663411e..f95e62e2 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java @@ -1,6 +1,8 @@ package com.nflg.wms.common.pojo.dto; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.nflg.wms.common.util.DateTimeUtil; import lombok.Data; import lombok.experimental.Accessors; @@ -31,6 +33,10 @@ public class TransferOrderDTO { */ private String bdter; + public String getBdter() { + return DateTimeUtil.formatFromMillis(bdter); + } + /** * 物料组 */ @@ -81,6 +87,10 @@ public class TransferOrderDTO { */ private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + /** * 基本计量单位 */ @@ -135,6 +145,6 @@ public class TransferOrderDTO { private String key; public String getKey() { - return werks + "|" + rsnum + "|" + bwart + "|" + mblnr + "|" + lgort + "|" + umlgo + "|" + bdter; + return werks + "|" + getRsnum() + "|" + bwart + "|" + mblnr + "|" + lgort + "|" + umlgo + "|" + getBdter(); } } \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutCostcenterSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutCostcenterSearchQO.java index 1f50f255..98646da4 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutCostcenterSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutCostcenterSearchQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import cn.hutool.core.util.StrUtil; import lombok.Data; @Data @@ -25,6 +26,10 @@ public class OutCostcenterSearchQO extends SearchBaseQO { */ private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + /** * 成本中心 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveItemQO.java index a43178fb..9adf77e9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveItemQO.java @@ -65,5 +65,5 @@ public class SRMOrderReceiveItemQO { /** * 是否质检 */ - private Boolean isQuality; + private String isQuality; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveQO.java index 21ed92c7..9661e68c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMOrderReceiveQO.java @@ -2,50 +2,8 @@ package com.nflg.wms.common.pojo.qo; import lombok.Data; -import java.util.List; - @Data public class SRMOrderReceiveQO { - /** - * 送货单号 - */ - private String noteNum; - - /** - * 公司 - */ - private String ouCode; - - /** - * 工厂 - */ - private String iuCode; - - /** - * 采购组 - */ - private String purchaseGroup; - - /** - * 发货时间 - */ - private String deliveryNoteDate; - - /** - * 运单号 - */ - private String waybillNum; - - /** - * 供应商编号 - */ - private String supplierNum; - - /** - * 供应商名称 - */ - private String supplierName; - - private List resultSet; + private String jsonstring; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMQualityInspectionResult.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMQualityInspectionResult.java index 48fd8440..affc8f85 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMQualityInspectionResult.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SRMQualityInspectionResult.java @@ -2,119 +2,8 @@ package com.nflg.wms.common.pojo.qo; import lombok.Data; -import java.math.BigDecimal; - @Data public class SRMQualityInspectionResult { - /** - 质检单号 - */ - public String inspectionNum; - - /** - 工厂 - */ - public String factory; - - /** - 送货数量 - */ - public BigDecimal deliveryQty; - - /** - 检验结果 - */ - public String inspectionResult; - - /** - 物料号 - */ - public String itemCode; - - /** - 供应商代码 - */ - public String supplierNum; - - /** - 检验类型 - */ - public String inspectionType; - - /** - 采购单行号 - */ - public String poLineNumber; - - /** - 检验数量 - */ - public BigDecimal inspectionQty; - - /** - 物料描述 - */ - public String itemName; - - /** - 单位 - */ - public String unit; - - /** - 收货仓库 - */ - public String receivedWarehouse; - - /** - 不合格原因 - */ - public String unqualifiedReason; - - /** - 采购订单号 - */ - public String poNum; - - /** - 物料凭证（收货时SAP返回的凭证） - */ - public String receiveNum; - - /** - 不合格数量 - */ - public BigDecimal unqualifiedQty; - - /** - 合格数量合格数量 - */ - public BigDecimal qualifiedQty; - - /** - 收货时的凭证 - */ - public String materialBatch; - - /** - 收货时的批次 - */ - public String receiveBatchNum; - - /** - 收货时的序列号 - */ - public String serialNum; - - - /** - 送货单行号 - */ - public String lineNumber; - - /** - 送货单号 - */ - public String noteNum; + private String jsonstring; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java index 0986ca06..fbc45a7f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java @@ -1,6 +1,6 @@ package com.nflg.wms.common.pojo.qo; -import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -17,9 +17,11 @@ public class SrmMaterialReceiptQO { * 送货单行ID */ private Long id; + /** * 订单编号 */ + @NotBlank private String noteNum; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TransferFactorySearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TransferFactorySearchQO.java index 809773fd..56973df1 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TransferFactorySearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TransferFactorySearchQO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.qo; +import cn.hutool.core.util.StrUtil; import lombok.Data; @Data @@ -15,6 +16,10 @@ public class TransferFactorySearchQO extends SearchBaseQO { */ private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + /** * 调出仓 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackInfoVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackInfoVO.java index d1e052b3..e60bc5f9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackInfoVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackInfoVO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import cn.hutool.core.util.StrUtil; import lombok.Data; import java.time.LocalDateTime; @@ -45,6 +46,10 @@ public class InCostcenterBackInfoVO { */ private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + /** * 成本中心 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackVO.java index b23b868b..6a2f831f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackVO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import cn.hutool.core.util.StrUtil; import lombok.Data; import java.time.LocalDateTime; @@ -44,6 +45,10 @@ public class InCostcenterBackVO { */ private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + /** * 成本中心 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackItemVO.java index 16892249..3ee10f85 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackItemVO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import cn.hutool.core.util.StrUtil; import lombok.Data; import java.math.BigDecimal; @@ -99,6 +100,10 @@ public class InProduceBackItemVO { */ private String rsnum2; + public String getRsnum2() { + return StrUtil.removeAllPrefix(rsnum2, "0"); + } + /** * 采购组 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackTicketItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackTicketItemVO.java index 4be9777f..03e42cf0 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackTicketItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackTicketItemVO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import cn.hutool.core.util.StrUtil; import lombok.Data; import lombok.experimental.Accessors; @@ -96,6 +97,10 @@ public class InProduceBackTicketItemVO { */ private String rsnum2; + public String getRsnum2() { + return StrUtil.removeAllPrefix(rsnum2, "0"); + } + /** * 采购组 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackVO.java index 9e9cdb93..c6e398e2 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackVO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import cn.hutool.core.util.StrUtil; import lombok.Data; import java.time.LocalDateTime; @@ -24,6 +25,10 @@ public class InProduceBackVO { */ private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + /** * 物料号 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java index b4ba405a..63b34430 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java @@ -26,5 +26,10 @@ public class OutProduce1VO { */ private String ebeln; + /** + * 供应商名称 + */ + private String supplierName; + private List items; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java index a4216c0a..b56fdcff 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.experimental.Accessors; @@ -18,6 +19,10 @@ public class Zwm3a07VO { //预留/相关需求的编号 private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + //物料号 private String plnbez; @@ -93,6 +98,10 @@ public class Zwm3a07VO { //预留/相关需求的编号 private String rsnum2; + public String getRsnum2() { + return StrUtil.removeAllPrefix(rsnum2, "0"); + } + //物料描述（短文本） private String maktx2; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09VO.java index a394f585..183c7de8 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09VO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.experimental.Accessors; @@ -16,6 +17,10 @@ public class Zwm3a09VO { //预留/相关需求的编号 private String rsnum; + public String getRsnum() { + return StrUtil.removeAllPrefix(rsnum, "0"); + } + //物料号 private String plnbez; @@ -25,6 +30,9 @@ public class Zwm3a09VO { //操作/活动编号 private String vornr; + public String getVornr() { + return StrUtil.removeAllPrefix(vornr, "0"); + } //序列号 private String sernr; @@ -58,6 +66,10 @@ public class Zwm3a09VO { //预留/相关需求的项目编号 private String rspos; + public String getRspos() { + return StrUtil.removeAllPrefix(rspos, "0"); + } + //其它预留 private BigDecimal sqsl2; @@ -91,6 +103,10 @@ public class Zwm3a09VO { //预留/相关需求的编号 private String rsnum2; + public String getRsnum2() { + return StrUtil.removeAllPrefix(rsnum2, "0"); + } + //物料描述（短文本） private String maktx2; @@ -100,6 +116,8 @@ public class Zwm3a09VO { //MRP 控制者（物料计划人） private String dispo; + private String name1; + @JsonIgnore private String key2; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/util/DateTimeUtil.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/util/DateTimeUtil.java index ca19e4f4..49eeb498 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/util/DateTimeUtil.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/util/DateTimeUtil.java @@ -2,6 +2,7 @@ package com.nflg.wms.common.util; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import java.time.LocalDate; @@ -77,7 +78,7 @@ public class DateTimeUtil { } public static String formatFromMillis(String millis, String format) { - if (StrUtil.isBlank(millis)) { + if (StrUtil.isBlank(millis) || !NumberUtil.isNumber(millis)) { return millis; } return LocalDateTimeUtil.format(LocalDateTimeUtil.of(Long.parseLong(millis)), format); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrder.java index bfb2a480..c32b5f21 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmOrder.java @@ -72,9 +72,9 @@ public class WmsSrmOrder implements Serializable { private String ouCode; /** - * 发货时间 + * 发货日期 */ - private LocalDateTime deliveryNoteDate; + private String deliveryNoteDate; /** * 是否已完结 diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptItemMapper.xml index f5392c2d..a840e4a4 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptItemMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptItemMapper.xml @@ -3,13 +3,12 @@ diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml index fae7a09d..c2e0885b 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml @@ -9,14 +9,10 @@ create_time, factory_code from wms_qc_receive - - and is_completed = 0 - - - and ( in_no like concat( '%',#{orderNo},'%') or order_no like concat( '%',#{orderNo},'%') ) - - - + where is_completed = 0 + + and ( in_no like concat( '%',#{orderNo},'%') or order_no like concat( '%',#{orderNo},'%') ) + order by create_time desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml index 2c6fcd54..469d8079 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml @@ -2,23 +2,18 @@