From 76f88ef3ce1cad20e1d3f95033fe338a52587c11 Mon Sep 17 00:00:00 2001 From: gongbx Date: Fri, 31 May 2024 15:07:04 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/common/enums/wms/EasBillTypeEnum.java | 6 ++- .../controller/AllocationBillController.java | 6 +-- .../eas/controller/ReceiptBillController.java | 7 +-- .../wms/database/eas/dao/AllocationBill.java | 11 ++--- .../nl/wms/database/eas/dao/ReceiptBill.java | 12 +++-- .../eas/dao/mapper/AllocationBillMapper.java | 8 ++-- .../eas/dao/mapper/ReceiptBillMapper.java | 15 +++++- .../eas/dao/xml/AllocationBillMapper.xml | 2 +- .../eas/dao/xml/ReceiptBillMapper.xml | 26 ++++------- .../eas/dto/ReceiptBillDetailDto.java | 10 +++- .../wms/database/eas/dto/ReceiptBillDto.java | 8 +--- .../wms/database/eas/dto/ReceiptBillVO.java | 2 +- .../eas/service/IallocationBillService.java | 2 +- .../eas/service/IreceiptBillService.java | 3 +- .../impl/AllocationBillServiceImpl.java | 46 +++++++++++++------ .../service/impl/EasOutInBillServiceImpl.java | 32 +++++++++++-- .../service/impl/ReceiptBillServiceImpl.java | 35 +++++++------- .../org/nl/wms/ext/eas/WmsToEasService.java | 3 ++ .../org/nl/wms/ext/srm/WmsToSrmService.java | 7 ++- 19 files changed, 154 insertions(+), 87 deletions(-) diff --git a/nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java b/nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java index 17d89c8..ae5c89e 100644 --- a/nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java +++ b/nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java @@ -20,7 +20,11 @@ public enum EasBillTypeEnum { WWRKD(9, "委外入库", "WWRKD"), IN(10, "入库", "IN"), OUT(11, "出库", "OUT"), - OTHER(12, "其他", "12"); + OTHER(12, "其他", "12"), + SHDJ(13, "收货确认", "SHDJ"), + DBQR(14, "调拨确认", "DBQR"), + DB(15, "调拨", "DB"), + SH(16, "收货", "SH"); private int index; private String name; diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java index ab2228b..4cc2805 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/AllocationBillController.java @@ -46,7 +46,7 @@ public class AllocationBillController { */ @PostMapping("/allocationPage") @Log("分页查询") - public ResponseEntity> allocationPage(@RequestBody AllocationBillQuery params) { + public ResponseEntity> allocationPage(@RequestBody AllocationBillQuery params) { return new ResponseEntity<>(allocationBillService.allocationPage(params), HttpStatus.OK); } @@ -85,8 +85,8 @@ public class AllocationBillController { if (params.isEmpty()) { throw new BadRequestException("参数为空！"); } - // return RestBusinessTemplate.execute(() -> allocationBillService.allocationConfirm(params)); - return RestBusinessTemplate.execute(() -> null); + return RestBusinessTemplate.execute(() -> allocationBillService.allocationConfirm(params)); + //return RestBusinessTemplate.execute(() -> null); } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/ReceiptBillController.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/ReceiptBillController.java index 3303926..6c0ba60 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/ReceiptBillController.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/ReceiptBillController.java @@ -10,6 +10,7 @@ import org.nl.common.base.RestBusinessTemplate; import org.nl.common.base.ResultCode; import org.nl.common.exception.BadRequestException; import org.nl.wms.database.eas.dao.ReceiptBill; +import org.nl.wms.database.eas.dto.AllocationBillQuery; import org.nl.wms.database.eas.dto.ReceiptBillQuery; import org.nl.wms.ext.srm.WmsToSrmService; import org.springframework.web.bind.annotation.*; @@ -46,7 +47,7 @@ public class ReceiptBillController { */ @PostMapping("/receiptPage") @Log("分页查询") - public ResponseEntity> receiptPage(@RequestBody ReceiptBillQuery params) { + public ResponseEntity> receiptPage(@RequestBody ReceiptBillQuery params) { return new ResponseEntity<>(receiptBillService.receiptPage(params), HttpStatus.OK); } @@ -88,8 +89,8 @@ public class ReceiptBillController { if (params.isEmpty()) { throw new BadRequestException("参数为空！"); } - // return RestBusinessTemplate.execute(() -> receiptBillService.receiptConfirm(params)); - return RestBusinessTemplate.execute(() -> null); + return RestBusinessTemplate.execute(() -> receiptBillService.receiptConfirm(params)); + //return RestBusinessTemplate.execute(() -> null); } /** diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill.java index 020a892..db01911 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill.java @@ -22,12 +22,15 @@ public class AllocationBill extends Model { private static final long serialVersionUID = -7739291296662381393L; - + /** + * 分录id + */ + @TableId(value = "flid", type = IdType.NONE) + private String flid; /** * 单据ID */ - @TableId(value = "djid", type = IdType.NONE) private String djid; /** @@ -61,11 +64,7 @@ public class AllocationBill extends Model { - /** - * 分录id - */ - private String flid; diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java index 73fda17..39a6680 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill.java @@ -23,10 +23,15 @@ public class ReceiptBill extends Model { private static final long serialVersionUID = -7739291296662381393L; + /** + * 分录ID + */ + @TableId(value = "flid", type = IdType.NONE) + private String flid; + /** * 送货单id */ - @TableId(value = "djid", type = IdType.NONE) private String djid; @@ -69,10 +74,7 @@ public class ReceiptBill extends Model { private String kwbm; - /** - * 分录ID - */ - private String flid; + /** diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java index ae299d6..51dc62b 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java @@ -23,14 +23,14 @@ public interface AllocationBillMapper extends BaseMapper { Long getAllocationCount(@Param("fuzzy") String fuzzy); @DS("oracle_eas") - List allocationPage(@Param("fuzzy") String fuzzy, @Param("page") Integer page, @Param("size") Integer size ); + List allocationPage(@Param("fuzzy") String fuzzy, @Param("page") Integer page, @Param("size") Integer size ); - @Select("SELECT COUNT(*) FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL WHERE DJBH = #{djbh}") + @Select("SELECT COUNT(*) FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL WHERE DJID = #{djid}") @DS("oracle_eas") - Long getTotalCount(@Param("djbh") String djbh); + Long getTotalCount(@Param("djid") String djid); @DS("oracle_eas") - List allocationDetailPage(@Param("page") Integer page, @Param("size") Integer size, @Param("djbh") String djbh, @Param("fuzzy") String fuzzy); + List allocationDetailPage(@Param("page") Integer page, @Param("size") Integer size, @Param("djid") String djid, @Param("fuzzy") String fuzzy); } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java index 0c867ee..1133bbd 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java @@ -3,8 +3,11 @@ package org.nl.wms.database.eas.dao.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.lettuce.core.dynamic.annotation.Param; +import org.apache.ibatis.annotations.Select; +import org.checkerframework.checker.units.qual.A; import org.nl.wms.database.eas.dao.ReceiptBill; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.database.eas.dto.AllocationBillQuery; import org.nl.wms.database.eas.dto.ReceiptBillQuery; /** @@ -14,9 +17,17 @@ import org.nl.wms.database.eas.dto.ReceiptBillQuery; * @since 2024-05-25 */ public interface ReceiptBillMapper extends BaseMapper { + + @DS("mysql_srm") + @Select("SELECT COUNT(1) FROM (SELECT DJID FROM v_wms_recbill_third GROUP BY DJID) A") + Long receiptCounts(); + @DS("mysql_srm") - Page receiptPage(Page page, @Param("fuzzy") String fuzzy); + Page receiptPage(Page page, @Param("fuzzy") String fuzzy); + + + @DS("mysql_srm") - Page receiptDetailPage(Page page, @Param("djbh") String djbh, @Param("fuzzy") String fuzzy); + Page receiptDetailPage(Page page, @Param("djid") String djid, @Param("fuzzy") String fuzzy); } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml index ffe7d57..7c963d0 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml @@ -44,7 +44,7 @@ SELECT * FROM ( SELECT V.*, ROW_NUMBER() OVER (ORDER BY V.CJSJ DESC) AS RNUM FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL V - WHERE V.DJBH = #{djbh} + WHERE V.DJID = #{djid} ) WHERE RNUM BETWEEN (#{page} - 1) * #{size} + 1 AND #{page} * #{size} diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml index 65a6815..ba5f3bd 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml @@ -8,27 +8,21 @@ WHERE djbh LIKE CONCAT('%', #{fuzzy}, '%') OR wlmc LIKE CONCAT('%', #{fuzzy}, '%') OR ggxh LIKE CONCAT('%', #{fuzzy}, '%') - OR fzsl LIKE CONCAT('%', #{fuzzy}, '%') - OR jldw LIKE CONCAT('%', #{fuzzy}, '%') - OR sl LIKE CONCAT('%', #{fuzzy}, '%') - OR kclx LIKE CONCAT('%', #{fuzzy}, '%') - OR kczt LIKE CONCAT('%', #{fuzzy}, '%') - OR dcck LIKE CONCAT('%', #{fuzzy}, '%') - OR dccw LIKE CONCAT('%', #{fuzzy}, '%') - OR drck LIKE CONCAT('%', #{fuzzy}, '%') - OR drcw LIKE CONCAT('%', #{fuzzy}, '%') - OR trackno LIKE CONCAT('%', #{fuzzy}, '%') - OR ywrq LIKE CONCAT('%', #{fuzzy}, '%') - OR bz LIKE CONCAT('%', #{fuzzy}, '%') + OR djbh LIKE CONCAT('%', #{fuzzy}, '%') + OR cggs LIKE CONCAT('%', #{fuzzy}, '%') + OR zzmc LIKE CONCAT('%', #{fuzzy}, '%') + OR ckmc LIKE CONCAT('%', #{fuzzy}, '%') + OR kwmc LIKE CONCAT('%', #{fuzzy}, '%') + OR gys LIKE CONCAT('%', #{fuzzy}, '%') GROUP BY - djbh - ORDER BY djbh ASC + DJID + ORDER BY TJSJ DESC diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDetailDto.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDetailDto.java index 3672adf..0f47156 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDetailDto.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDetailDto.java @@ -36,12 +36,18 @@ public class ReceiptBillDetailDto implements Serializable { /** * 收货仓库编码 */ - private String ckbm; + private String warehouseNo; /** * 收货库位编码 */ - private String kwbm; + private String locationNo; + + + /** + * 收货库位编码 + */ + private String remark; } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDto.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDto.java index 32f9e90..6009fbf 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDto.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillDto.java @@ -34,13 +34,9 @@ public class ReceiptBillDto implements Serializable { /** * 操作人 */ - private String inWhUser; + private String recUser; - /** - * 业务日期 - */ - private String bizDate; /** @@ -55,7 +51,7 @@ public class ReceiptBillDto implements Serializable { private String description; - List entrys; + List details; } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillVO.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillVO.java index 222bf77..5304a2d 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillVO.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dto/ReceiptBillVO.java @@ -64,7 +64,7 @@ public class ReceiptBillVO extends BaseQuery { /** * 收货库位编码 */ - private String kwbm; + private String kwmc; /** diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IallocationBillService.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IallocationBillService.java index 948a8d3..3365023 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IallocationBillService.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IallocationBillService.java @@ -25,7 +25,7 @@ public interface IallocationBillService extends IService { * @param params 查询条件 * @return IPage */ - CommonPage allocationPage(AllocationBillQuery params); + CommonPage allocationPage(AllocationBillQuery params); /** diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IreceiptBillService.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IreceiptBillService.java index abd86f0..965288b 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IreceiptBillService.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IreceiptBillService.java @@ -3,6 +3,7 @@ package org.nl.wms.database.eas.service; import org.nl.common.base.CommonPage; import org.nl.wms.database.eas.dao.ReceiptBill; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.database.eas.dto.AllocationBillQuery; import org.nl.wms.database.eas.dto.ReceiptBillQuery; import org.nl.wms.database.eas.dto.ReceiptBillVO; @@ -24,7 +25,7 @@ public interface IreceiptBillService extends IService { * @param params 查询条件 * @return IPage */ - CommonPage receiptPage(ReceiptBillQuery params); + CommonPage receiptPage(ReceiptBillQuery params); /** * 分页查询 diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java index 59bcb4b..eca64d8 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java @@ -25,6 +25,8 @@ import javax.annotation.Resource; import org.nl.common.base.CommonPage; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Map; import java.util.Set; @@ -55,11 +57,19 @@ public class AllocationBillServiceImpl extends ServiceImpl allocationPage(AllocationBillQuery params) { + public CommonPage allocationPage(AllocationBillQuery params) { // 查询总记录数 long totalCount = allocationBillMapper.getAllocationCount(params.getFuzzy()); - List allocationBills = allocationBillMapper.allocationPage(params.getFuzzy(),params.getPage(),params.getSize()); - return CommonPage.getPage(allocationBills, totalCount,params.getPage(),params.getSize()); + List allocationBills = allocationBillMapper.allocationPage(params.getFuzzy(), params.getPage(), params.getSize()); + if (!allocationBills.isEmpty()) { + allocationBills = allocationBills.stream() + .peek(r -> { + r.setJhdrrq(LocalDateTime.parse(r.getJhdrrq(), DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")).toLocalDate().toString()); + r.setJhdcrq(LocalDateTime.parse(r.getJhdcrq(), DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")).toLocalDate().toString()); + }) + .collect(Collectors.toList()); + } + return CommonPage.getPage(allocationBills, totalCount, params.getPage(), params.getSize()); } @@ -70,12 +80,12 @@ public class AllocationBillServiceImpl extends ServiceImpl page(AllocationBillQuery params) { - if (StringUtils.isBlank(params.getDjbh())) { + if (StringUtils.isBlank(params.getDjid())) { throw new BadRequestException("单据编号不能为空"); } // 查询总记录数 - long totalCount = allocationBillMapper.getTotalCount(params.getDjbh()); - List allocationBillList = allocationBillMapper.allocationDetailPage(params.getPage(),params.getSize(), params.getDjbh(), params.getFuzzy()); + long totalCount = allocationBillMapper.getTotalCount(params.getDjid()); + List allocationBillList = allocationBillMapper.allocationDetailPage(params.getPage(), params.getSize(), params.getDjid(), params.getFuzzy()); if (!allocationBillList.isEmpty()) { // 获取更新列表 List updateList = allocationBillMapper.selectList( @@ -96,8 +106,13 @@ public class AllocationBillServiceImpl extends ServiceImpl entrys = new ArrayList<>(); params.forEach(r -> { AllocationBillDetailDto dto = new AllocationBillDetailDto(); @@ -157,8 +172,13 @@ public class AllocationBillServiceImpl extends ServiceImpl getBillsCount() { - return easOutInBillMapper.getBillsCount(); + List allCounts =easOutInBillMapper.getBillsCount(); + HomeBillCounts allocations =new HomeBillCounts(); + Long allocation =allocationBillMapper.getAllocationCount(""); + allocations.setCounts(allocation.toString()); + allocations.setName(EasBillTypeEnum.DBQR.getName()); + allocations.setDjlx(EasBillTypeEnum.DBQR.getCode()); + allocations.setYwlx(EasBillTypeEnum.DB.getCode()); + HomeBillCounts receipts =new HomeBillCounts(); + Long receipt = receiptBillMapper.receiptCounts(); + receipts.setCounts(receipt.toString()); + receipts.setName(EasBillTypeEnum.SHDJ.getName()); + receipts.setDjlx(EasBillTypeEnum.SHDJ.getCode()); + receipts.setYwlx(EasBillTypeEnum.SH.getCode()); + allCounts.add(allocations); + allCounts.add(receipts); + return allCounts; } /** @@ -114,7 +137,8 @@ public class EasOutInBillServiceImpl extends ServiceImpl i.like(EasOutInBill::getDjid, params.getFuzzy()) .or() @@ -540,7 +564,7 @@ public class EasOutInBillServiceImpl extends ServiceImpl receiptPage(ReceiptBillQuery params) { - Page pageObject = new Page<>(params.getPage(), params.getSize()); - Page receiptBills = receiptBillMapper.receiptPage(pageObject, params.getFuzzy()); + public CommonPage receiptPage(ReceiptBillQuery params) { + Page pageObject = new Page<>(params.getPage(), params.getSize()); + Page receiptBills = receiptBillMapper.receiptPage(pageObject, params.getFuzzy()); return CommonPage.getPage(receiptBills); } @@ -67,17 +69,18 @@ public class ReceiptBillServiceImpl extends ServiceImpl page(ReceiptBillVO params) { - if (StringUtils.isBlank(params.getDjbh())) { + if (StringUtils.isBlank(params.getDjid())) { throw new BadRequestException("单据编号不能为空"); } Page pageObject = new Page<>(params.getPage(), params.getSize()); - Page receiptBills = receiptBillMapper.receiptDetailPage(pageObject, params.getDjbh(), params.getFuzzy()); + Page receiptBills = receiptBillMapper.receiptDetailPage(pageObject, params.getDjid(), params.getFuzzy()); List receiptBillList = receiptBills.getRecords(); if (!receiptBillList.isEmpty()) { List updateList = receiptBillMapper.selectList( new LambdaQueryWrapper().eq(ReceiptBill::getDjid, receiptBillList.get(0).getDjid())); if (!updateList.isEmpty()) { - Map updateMap = updateList.stream() + Map updateMap = + updateList.stream() .collect(Collectors.toMap(ReceiptBill::getFlid, updateBill -> updateBill)); //替换修改记录 receiptBillList = receiptBillList.stream() @@ -125,24 +128,24 @@ public class ReceiptBillServiceImpl extends ServiceImpl entrys = new ArrayList<>(); + List details = new ArrayList<>(); params.forEach(r -> { ReceiptBillDetailDto dto = new ReceiptBillDetailDto(); - dto.setCkbm(r.getCkbm()); - dto.setKwbm(r.getKwbm()); - dto.setEntryId(r.getFlid()); + dto.setEntryId(r.getFlid()); + dto.setWarehouseNo(r.getCkbm()); + dto.setLocationNo(r.getKwmc()); dto.setShsl(r.getShsl()); - entrys.add(dto); + dto.setRemark(r.getBz()); + details.add(dto); } ); - receiptBillDto.setEntrys(entrys); + receiptBillDto.setDetails(details); try { SrmMsgDto srmMsgDto; String billJson = com.alibaba.fastjson.JSON.toJSONString(receiptBillDto, SerializerFeature.WriteMapNullValue); - srmMsgDto = wmsToSrmService.sendWebPostData(billJson); + srmMsgDto = wmsToSrmService.sendWebPostData(billJson,2); if (srmMsgDto != null) { if ("false".equals(srmMsgDto.getSuccess())) { throw new BadRequestException(srmMsgDto.getMessage()); @@ -171,7 +174,7 @@ public class ReceiptBillServiceImpl extends ServiceImpl