From ea109c3b3975a5ea6b6a5b5e0c949a9971dad396 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Mon, 2 Sep 2024 09:52:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0lasttime=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?2024=E5=B9=B49=E6=9C=882=E6=97=A509:52:13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kjs/service/impl/DeliveryOrderPluginServiceImpl.java | 2 +- .../plugin/kjs/service/impl/MomOrderPluginServiceImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java index 46966526..bc3814d9 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java @@ -86,7 +86,7 @@ public class DeliveryOrderPluginServiceImpl extends KjsPluginBaseService impleme logger.info("发货单请求参数:{}",reqParams); //调用wms接口 Map headerMap = MapBuilder.create(true) - .put("apiCode", "8000080006") + .put("apiCode", "8000080008") .put("publicKey","ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj") .put("secretKey","fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") .put("appId","800008") diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java index 96173f22..5afa5599 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java @@ -75,17 +75,19 @@ public class MomOrderPluginServiceImpl extends KjsPluginBaseService implements I //查询生产订单明细表 MomOrderDetailEntity detailEntity = new MomOrderDetailEntity(); detailEntity.setMoId(order.getMoId()); + detailEntity.setStartTime(startTime); + detailEntity.setEndTime(endTime); detailEntity.setDataSourceCode(datasourceCode); List detailList = momOrderDetailService.query(detailEntity); //表头转换dto MomOrderDTO momOrderDTO = MomOrderMapper.INSTANCE.momOrderEntityToDto(order); //表体转换dto List momOrderDetailList = MomOrderMapper.INSTANCE.momOrderDetailListToDto(detailList); - momOrderDTO.setItesm(momOrderDetailList); + momOrderDTO.setItems(momOrderDetailList); String reqParam = JSONObject.toJSONString(momOrderDTO); logger.info("u8生产订单传wms请求参数：{}",reqParam); Map headerMap = MapBuilder.create(true) - .put("apiCode", "8000080006") + .put("apiCode", "8000080007") .put("publicKey","ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj") .put("secretKey","fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") .put("appId","800008")