From 74380d2bc5d2be1a05f8857cf5d76a3db8ab5a7e Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Wed, 8 May 2024 15:36:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=BA=E8=B4=9F=E6=95=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/eas/controller/EasOutInBillController.java | 2 +- .../database/eas/dao/mapper/EasOutInBillDetailMapper.java | 4 ++-- .../wms/database/eas/dao/mapper/EasOutInBillMapper.java | 2 +- .../nl/wms/database/eas/service/IeasOutInBillService.java | 2 +- .../eas/service/impl/EasOutInBillServiceImpl.java | 2 +- .../src/main/java/org/nl/wms/ext/eas/WmsToEasService.java | 6 +----- .../src/main/java/org/nl/wms/ext/srm/WmsToSrmService.java | 3 --- .../main/java/org/nl/wms/schedule/EasBillSchedule.java | 8 +++----- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java index 55b7172..2dd4272 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/controller/EasOutInBillController.java @@ -52,7 +52,7 @@ public class EasOutInBillController { @Log("审核") @SaIgnore //@SaCheckPermission("@el.check(EasOutInBill:edit')") - public CommonResult audit(@RequestBody Set ids) { + public CommonResult audit(@RequestBody List ids) { if (ids == null || ids.isEmpty()) { return CommonResult.failed(ResultCode.FAILED); } diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillDetailMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillDetailMapper.java index 743848e..09ac44b 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillDetailMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillDetailMapper.java @@ -21,9 +21,9 @@ public interface EasOutInBillDetailMapper extends BaseMapper List queryInventoryInfo(@Param("params") EasOutInBillDetailVO params); - List queryBillDetailList(@Param("ids") Set ids); + List queryBillDetailList(@Param("ids") List ids); - List queryDetailList(@Param("ids") Set ids); + List queryDetailList(@Param("ids") List ids); void insertBatch(List entities); diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java index 809dc92..e20ed23 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/EasOutInBillMapper.java @@ -30,7 +30,7 @@ public interface EasOutInBillMapper extends BaseMapper { - List queryBillList(@Param("ids") Set ids); + List queryBillList(@Param("ids") List ids); List getBillsCount(); diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IeasOutInBillService.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IeasOutInBillService.java index 7bc559e..4dc0c5a 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IeasOutInBillService.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/IeasOutInBillService.java @@ -106,7 +106,7 @@ public interface IeasOutInBillService extends IService { * * @param ids / */ - void audit(Set ids, boolean isDetail); + void audit(List ids, boolean isDetail); /** diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java index a2c332e..9e518f3 100644 --- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java +++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java @@ -391,7 +391,7 @@ public class EasOutInBillServiceImpl extends ServiceImpl ids, boolean isDetail) { + public void audit(List ids, boolean isDetail) { if (CollectionUtils.isEmpty(ids)) { throw new BadRequestException("id不能为空！"); } diff --git a/nlsso-server/src/main/java/org/nl/wms/ext/eas/WmsToEasService.java b/nlsso-server/src/main/java/org/nl/wms/ext/eas/WmsToEasService.java index fe204f1..8ad33c5 100644 --- a/nlsso-server/src/main/java/org/nl/wms/ext/eas/WmsToEasService.java +++ b/nlsso-server/src/main/java/org/nl/wms/ext/eas/WmsToEasService.java @@ -46,8 +46,6 @@ public class WmsToEasService { private String operationName; public MsgDto sendWebService(String json) throws ServiceException, RemoteException { - log.error("Eas同步接口开始请求，请求json为:"+json); - MsgDto msgDto =new MsgDto(); Service s = new Service(); Call call = (Call) s.createCall(); call.setOperationName("login"); @@ -90,8 +88,6 @@ public class WmsToEasService { log.error("Eas同步接口invoke调用结果：" + invoke.toString()); log.error("Eas同步接口调用结果：" + results); System.out.println(invoke); - MsgDto d2 = JSON.parseObject(String.valueOf(invoke), MsgDto.class); - MsgDto d1 = JSON.toJavaObject(JSON.parseObject((String) invoke), MsgDto.class); - return d1; + return JSON.toJavaObject(JSON.parseObject((String) invoke), MsgDto.class); } } \ No newline at end of file diff --git a/nlsso-server/src/main/java/org/nl/wms/ext/srm/WmsToSrmService.java b/nlsso-server/src/main/java/org/nl/wms/ext/srm/WmsToSrmService.java index 7c6eaef..6bf7234 100644 --- a/nlsso-server/src/main/java/org/nl/wms/ext/srm/WmsToSrmService.java +++ b/nlsso-server/src/main/java/org/nl/wms/ext/srm/WmsToSrmService.java @@ -32,16 +32,13 @@ public class WmsToSrmService { private String host; public SrmMsgDto sendWebPostData(String json) throws ServiceException, RemoteException { - log.error("Srm同步接口开始请求，请求json为:"+json); SrmMsgDto srmMsgDto; com.alibaba.fastjson.JSONObject result; String resultMsg = HttpRequest.post(host) .body(json) .execute().body(); - log.error("Srm同步接口请求成功，输出参数为：-------------------" +resultMsg); srmMsgDto= JSON.parseObject(String.valueOf(resultMsg), SrmMsgDto.class); return srmMsgDto; - } } \ No newline at end of file diff --git a/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java b/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java index 2b02fa3..445f36e 100644 --- a/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java +++ b/nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java @@ -121,12 +121,10 @@ public class EasBillSchedule { private void updateBillInBatch(List djIdList1, List djIdList2) { if (!djIdList1.isEmpty() || !djIdList2.isEmpty()) { - //修改主表 - EasOutInBill easOutInBills = new EasOutInBill(); - easOutInBills.setDjzt("审核"); + //单据审核 djIdList1.addAll(djIdList2); - easOutInBillService.update(easOutInBills, new LambdaQueryWrapper().in(EasOutInBill::getDjid, djIdList1)); - //修改明细表 + easOutInBillService.audit(djIdList1,true); + //修改明细表审核状态 EasOutInBillDetail easOutInBillDetail = new EasOutInBillDetail(); easOutInBillDetail.setDjzt("审核"); easOutInBillDetailMapper.update(easOutInBillDetail, new LambdaQueryWrapper()