From f58e5ba4daf046b4c33327d0d0bc1dd636ba38d0 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Thu, 22 Aug 2024 18:40:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=202024=E5=B9=B48=E6=9C=8822=E6=97=A518:40:17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeliveryOrderPluginInitializer.java | 96 +++++++++ .../service/IDeliveryOrderPluginService.java | 18 ++ .../impl/DeliveryOrderPluginServiceImpl.java | 75 ++++++++ .../cfgHome/plugin/kjs/pluginCfg.xml | 6 + .../kjs/spring/spring-buildpackage-plugin.xml | 5 + .../spring/spring-buildpackage-service.xml | 5 + .../u8/delivery/dao/IDeliveryDetailDao.java | 12 ++ .../u8/delivery/dao/IDeliveryOrderDao.java | 12 ++ .../dao/impl/DeliveryDetailDaoImpl.java | 15 ++ .../dao/impl/DeliveryOrderDaoImpl.java | 15 ++ .../u8/delivery/dto/DeliveryDetailDTO.java | 179 +++++++++++++++++ .../u8/delivery/dto/DeliveryOrderDTO.java | 140 ++++++++++++++ .../delivery/entity/DeliveryDetailEntity.java | 182 ++++++++++++++++++ .../delivery/entity/DeliveryDetailEntity.xml | 57 ++++++ .../delivery/entity/DeliveryOrderEntity.java | 142 ++++++++++++++ .../delivery/entity/DeliveryOrderEntity.xml | 47 +++++ .../u8/delivery/service/DeliveryMapper.java | 42 ++++ .../service/IDeliveryDetaiService.java | 12 ++ .../service/IDeliveryOrderService.java | 12 ++ .../impl/DeliveryDetaiServiceImpl.java | 29 +++ .../impl/DeliveryOrderServiceImpl.java | 27 +++ 21 files changed, 1128 insertions(+) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/IDeliveryOrderPluginService.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/kjs/pluginCfg.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/dao/IDeliveryDetailDao.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/dao/IDeliveryOrderDao.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/dao/impl/DeliveryDetailDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/dao/impl/DeliveryOrderDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryDetailDTO.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/service/DeliveryMapper.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryDetaiService.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryOrderService.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryDetaiServiceImpl.java create mode 100644 service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryOrderServiceImpl.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java new file mode 100644 index 00000000..cf364401 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java @@ -0,0 +1,96 @@ +package com.hzya.frame.plugin.kjs.plugin; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/8/22 16:39 + **/ +public class DeliveryOrderPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(getClass()); + /*** + * 插件初始化方法 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-02 10:48 + * @Param [] + * @return void + **/ + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + /**** + * 插件销毁方法 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + /**** + * 插件的ID + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginId() { + return "kjsDeliveryOrderPlugin"; + } + + /**** + * 插件的名称 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginName() { + return "kjs发货单同步插件"; + } + + /**** + * 插件的显示值 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginLabel() { + return "kjs发货单同步插件"; + } + + /*** + * 插件类型 1、场景插件 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-02 14:01 + * @Param [] + * @return java.lang.String + **/ + @Override + public String getPluginType() { + return "1"; + } + + /*** + * 执行业务代码 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-07 11:20 + * @param requestJson 执行业务代码的参数 + * @return void + **/ + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + + return null; + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/IDeliveryOrderPluginService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/IDeliveryOrderPluginService.java new file mode 100644 index 00000000..438c0800 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/IDeliveryOrderPluginService.java @@ -0,0 +1,18 @@ +package com.hzya.frame.plugin.kjs.service; + +import com.alibaba.fastjson.JSONObject; + +/** + * @Description 发货单插件service + * @Author xiangerlin + * @Date 2024/8/22 16:43 + **/ +public interface IDeliveryOrderPluginService { + + /** + * 发货单同步到wms + * @param requestJson + * @return + */ + String sync2wms(JSONObject requestJson); +} 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 new file mode 100644 index 00000000..64c8d69d --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/DeliveryOrderPluginServiceImpl.java @@ -0,0 +1,75 @@ +package com.hzya.frame.plugin.kjs.service.impl; + +import cn.hutool.core.map.MapBuilder; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.plugin.kjs.service.IDeliveryOrderPluginService; +import com.hzya.frame.u8.delivery.dto.DeliveryDetailDTO; +import com.hzya.frame.u8.delivery.dto.DeliveryOrderDTO; +import com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity; +import com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity; +import com.hzya.frame.u8.delivery.service.DeliveryMapper; +import com.hzya.frame.u8.delivery.service.IDeliveryDetaiService; +import com.hzya.frame.u8.delivery.service.IDeliveryOrderService; +import org.apache.commons.collections.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; +import java.util.Map; + +/** + * @Description 发货单插件service + * @Author xiangerlin + * @Date 2024/8/22 16:46 + **/ +public class DeliveryOrderPluginServiceImpl implements IDeliveryOrderPluginService { + Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private IDeliveryOrderService deliveryOrderService; + @Autowired + private IDeliveryDetaiService deliveryDetaiService; + + /** + * 发货单同步到wsm + * @param requestJson + * @return + */ + @Override + public String sync2wms(JSONObject requestJson) { + //1 查询发货单主表 + DeliveryOrderEntity orderEntity = new DeliveryOrderEntity(); + orderEntity.setDataSourceCode("YONYOUU8"); + orderEntity.setDlid("1000000152"); + orderEntity.setbReturnFlag("0"); + List orderList = deliveryOrderService.query(orderEntity); + if (CollectionUtils.isNotEmpty(orderList)){ + for (DeliveryOrderEntity order : orderList) { + //2 查询发货单明细表 + DeliveryDetailEntity detailEntity = new DeliveryDetailEntity(); + detailEntity.setDlid(order.getDlid()); + detailEntity.setDataSourceCode("YONYOUU8"); + List detailList = deliveryDetaiService.query(detailEntity); + //发货单表头entity转dto + DeliveryOrderDTO deliveryOrderDTO = DeliveryMapper.INSTANCE.deliveryEntityToDto(order); + //发货单表体entity转dto + List deliveryDetailList = DeliveryMapper.INSTANCE.deliveryDetailListToDto(detailList); + deliveryOrderDTO.setItesm(deliveryDetailList); + String reqParams = JSONObject.toJSONString(deliveryOrderDTO); + logger.info("发货单请求参数:{}",reqParams); + //调用wms接口 + Map headerMap = MapBuilder.create(true) + .put("apiCode", "") + .put("publicKey","ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj") + .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") + .put("appId","") + .build(); + String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(reqParams).timeout(60000).execute().body(); + return body; + } + } + + return null; + } +} diff --git a/buildpackage/src/main/resources/cfgHome/plugin/kjs/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/kjs/pluginCfg.xml new file mode 100644 index 00000000..853a8391 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/kjs/pluginCfg.xml @@ -0,0 +1,6 @@ + + +kjsPlugin +kjs插件 +202408220001 + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..3cf0fef9 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml new file mode 100644 index 00000000..af24ff3a --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/dao/IDeliveryDetailDao.java b/service/src/main/java/com/hzya/frame/u8/delivery/dao/IDeliveryDetailDao.java new file mode 100644 index 00000000..a5f7b688 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/dao/IDeliveryDetailDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.u8.delivery.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity; + +/** + * @Description u8发货单明细行 + * @Author xiangerlin + * @Date 2024/8/22 16:22 + **/ +public interface IDeliveryDetailDao extends IBaseDao { +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/dao/IDeliveryOrderDao.java b/service/src/main/java/com/hzya/frame/u8/delivery/dao/IDeliveryOrderDao.java new file mode 100644 index 00000000..f63b6c22 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/dao/IDeliveryOrderDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.u8.delivery.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity; + +/** + * @Description U8发货单 + * @Author xiangerlin + * @Date 2024/8/22 15:07 + **/ +public interface IDeliveryOrderDao extends IBaseDao { +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/dao/impl/DeliveryDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/u8/delivery/dao/impl/DeliveryDetailDaoImpl.java new file mode 100644 index 00000000..41b3ddc7 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/dao/impl/DeliveryDetailDaoImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.u8.delivery.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.u8.delivery.dao.IDeliveryDetailDao; +import com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity; +import org.springframework.stereotype.Repository; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/8/22 16:24 + **/ +@Repository +public class DeliveryDetailDaoImpl extends MybatisGenericDao implements IDeliveryDetailDao { +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/dao/impl/DeliveryOrderDaoImpl.java b/service/src/main/java/com/hzya/frame/u8/delivery/dao/impl/DeliveryOrderDaoImpl.java new file mode 100644 index 00000000..1bf6508c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/dao/impl/DeliveryOrderDaoImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.u8.delivery.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.u8.delivery.dao.IDeliveryOrderDao; +import com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity; +import org.springframework.stereotype.Repository; + +/** + * @Description u8发货单 + * @Author xiangerlin + * @Date 2024/8/22 15:09 + **/ +@Repository +public class DeliveryOrderDaoImpl extends MybatisGenericDao implements IDeliveryOrderDao { +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryDetailDTO.java b/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryDetailDTO.java new file mode 100644 index 00000000..fa826495 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryDetailDTO.java @@ -0,0 +1,179 @@ +package com.hzya.frame.u8.delivery.dto; + +/** + * @Description 发货单明细行 + * @Author xiangerlin + * @Date 2024/8/22 17:01 + **/ +public class DeliveryDetailDTO { + //主表id + private String dlid; + //仓库编码 + private String cwhcode; + //仓库名称 + private String cwhname; + //存货编码 + private String cinvcode; + //存货名称 + private String cinvname; + //规格型号 + private String cinvstd; + //数量 + private String iquantity; + //件数 + private String inum; + //计量单位编码 + private String ccomunitcode; + //计量单位名称 + private String ccomunitname; + //辅计量单位编码 + private String casscomunitcode; + //辅计量单位名称 + private String casscomunitname; + //备注 + private String cmemo; + //行号 + private String irowno; + //订单行号 + private String iorderrowno; + //销售订单号 + private String csocode; + //税率 + private String itaxrate; + + public String getDlid() { + return dlid; + } + + public void setDlid(String dlid) { + this.dlid = dlid; + } + + public String getCwhcode() { + return cwhcode; + } + + public void setCwhcode(String cwhcode) { + this.cwhcode = cwhcode; + } + + public String getCwhname() { + return cwhname; + } + + public void setCwhname(String cwhname) { + this.cwhname = cwhname; + } + + public String getCinvcode() { + return cinvcode; + } + + public void setCinvcode(String cinvcode) { + this.cinvcode = cinvcode; + } + + public String getCinvname() { + return cinvname; + } + + public void setCinvname(String cinvname) { + this.cinvname = cinvname; + } + + public String getCinvstd() { + return cinvstd; + } + + public void setCinvstd(String cinvstd) { + this.cinvstd = cinvstd; + } + + public String getIquantity() { + return iquantity; + } + + public void setIquantity(String iquantity) { + this.iquantity = iquantity; + } + + public String getInum() { + return inum; + } + + public void setInum(String inum) { + this.inum = inum; + } + + public String getCcomunitcode() { + return ccomunitcode; + } + + public void setCcomunitcode(String ccomunitcode) { + this.ccomunitcode = ccomunitcode; + } + + public String getCcomunitname() { + return ccomunitname; + } + + public void setCcomunitname(String ccomunitname) { + this.ccomunitname = ccomunitname; + } + + public String getCasscomunitcode() { + return casscomunitcode; + } + + public void setCasscomunitcode(String casscomunitcode) { + this.casscomunitcode = casscomunitcode; + } + + public String getCasscomunitname() { + return casscomunitname; + } + + public void setCasscomunitname(String casscomunitname) { + this.casscomunitname = casscomunitname; + } + + public String getCmemo() { + return cmemo; + } + + public void setCmemo(String cmemo) { + this.cmemo = cmemo; + } + + public String getIrowno() { + return irowno; + } + + public void setIrowno(String irowno) { + this.irowno = irowno; + } + + public String getIorderrowno() { + return iorderrowno; + } + + public void setIorderrowno(String iorderrowno) { + this.iorderrowno = iorderrowno; + } + + public String getCsocode() { + return csocode; + } + + public void setCsocode(String csocode) { + this.csocode = csocode; + } + + public String getItaxrate() { + return itaxrate; + } + + public void setItaxrate(String itaxrate) { + this.itaxrate = itaxrate; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java b/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java new file mode 100644 index 00000000..a9072c4e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java @@ -0,0 +1,140 @@ +package com.hzya.frame.u8.delivery.dto; + +import java.util.List; + +/** + * @Description 发货单 + * @Author xiangerlin + * @Date 2024/8/22 17:01 + **/ +public class DeliveryOrderDTO { + private String dlid; + //发货单号 + private String cdlcode; + //客户编码 + private String ccuscode; + //客户名称 + private String ccusname; + //销售订单号 + private String csocode; + //发货日期 + private String ddate; + //制单人 + private String cmaker; + //制单时间 + private String dcreatesystime; + //币种 + private String cexch_name; + //汇率 + private String iexchrate; + //税率 + private String itaxrate; + //备注 + private String cmemo; + //子表 + private List itesm; + + public String getDlid() { + return dlid; + } + + public void setDlid(String dlid) { + this.dlid = dlid; + } + + public String getCdlcode() { + return cdlcode; + } + + public void setCdlcode(String cdlcode) { + this.cdlcode = cdlcode; + } + + public String getCcuscode() { + return ccuscode; + } + + public void setCcuscode(String ccuscode) { + this.ccuscode = ccuscode; + } + + public String getCcusname() { + return ccusname; + } + + public void setCcusname(String ccusname) { + this.ccusname = ccusname; + } + + public String getCsocode() { + return csocode; + } + + public void setCsocode(String csocode) { + this.csocode = csocode; + } + + public String getDdate() { + return ddate; + } + + public void setDdate(String ddate) { + this.ddate = ddate; + } + + public String getCmaker() { + return cmaker; + } + + public void setCmaker(String cmaker) { + this.cmaker = cmaker; + } + + public String getDcreatesystime() { + return dcreatesystime; + } + + public void setDcreatesystime(String dcreatesystime) { + this.dcreatesystime = dcreatesystime; + } + + public String getCexch_name() { + return cexch_name; + } + + public void setCexch_name(String cexch_name) { + this.cexch_name = cexch_name; + } + + public String getIexchrate() { + return iexchrate; + } + + public void setIexchrate(String iexchrate) { + this.iexchrate = iexchrate; + } + + public String getItaxrate() { + return itaxrate; + } + + public void setItaxrate(String itaxrate) { + this.itaxrate = itaxrate; + } + + public String getCmemo() { + return cmemo; + } + + public void setCmemo(String cmemo) { + this.cmemo = cmemo; + } + + public List getItesm() { + return itesm; + } + + public void setItesm(List itesm) { + this.itesm = itesm; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.java b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.java new file mode 100644 index 00000000..cb014fa3 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.java @@ -0,0 +1,182 @@ +package com.hzya.frame.u8.delivery.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Description U8发货明细行 + * @Author xiangerlin + * @Date 2024/8/22 16:12 + **/ +public class DeliveryDetailEntity extends BaseEntity { + + //主表id + private String dlid; + //仓库编码 + private String cwhcode; + //仓库名称 + private String cwhname; + //存货编码 + private String cinvcode; + //存货名称 + private String cinvname; + //规格型号 + private String cinvstd; + //数量 + private String iquantity; + //件数 + private String inum; + //计量单位编码 + private String ccomunitcode; + //计量单位名称 + private String ccomunitname; + //辅计量单位编码 + private String casscomunitcode; + //辅计量单位名称 + private String casscomunitname; + //备注 + private String cmemo; + //行号 + private String irowno; + //订单行号 + private String iorderrowno; + //销售订单号 + private String csocode; + //税率 + private String itaxrate; + + public String getDlid() { + return dlid; + } + + public void setDlid(String dlid) { + this.dlid = dlid; + } + + public String getCwhcode() { + return cwhcode; + } + + public void setCwhcode(String cwhcode) { + this.cwhcode = cwhcode; + } + + public String getCwhname() { + return cwhname; + } + + public void setCwhname(String cwhname) { + this.cwhname = cwhname; + } + + public String getCinvcode() { + return cinvcode; + } + + public void setCinvcode(String cinvcode) { + this.cinvcode = cinvcode; + } + + public String getCinvname() { + return cinvname; + } + + public void setCinvname(String cinvname) { + this.cinvname = cinvname; + } + + public String getCinvstd() { + return cinvstd; + } + + public void setCinvstd(String cinvstd) { + this.cinvstd = cinvstd; + } + + public String getIquantity() { + return iquantity; + } + + public void setIquantity(String iquantity) { + this.iquantity = iquantity; + } + + public String getInum() { + return inum; + } + + public void setInum(String inum) { + this.inum = inum; + } + + public String getCcomunitcode() { + return ccomunitcode; + } + + public void setCcomunitcode(String ccomunitcode) { + this.ccomunitcode = ccomunitcode; + } + + public String getCcomunitname() { + return ccomunitname; + } + + public void setCcomunitname(String ccomunitname) { + this.ccomunitname = ccomunitname; + } + + public String getCasscomunitcode() { + return casscomunitcode; + } + + public void setCasscomunitcode(String casscomunitcode) { + this.casscomunitcode = casscomunitcode; + } + + public String getCasscomunitname() { + return casscomunitname; + } + + public void setCasscomunitname(String casscomunitname) { + this.casscomunitname = casscomunitname; + } + + public String getCmemo() { + return cmemo; + } + + public void setCmemo(String cmemo) { + this.cmemo = cmemo; + } + + public String getIrowno() { + return irowno; + } + + public void setIrowno(String irowno) { + this.irowno = irowno; + } + + public String getIorderrowno() { + return iorderrowno; + } + + public void setIorderrowno(String iorderrowno) { + this.iorderrowno = iorderrowno; + } + + public String getCsocode() { + return csocode; + } + + public void setCsocode(String csocode) { + this.csocode = csocode; + } + + public String getItaxrate() { + return itaxrate; + } + + public void setItaxrate(String itaxrate) { + this.itaxrate = itaxrate; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml new file mode 100644 index 00000000..5190890e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + dls.dlid, + dls.cwhcode, + cwhname, + dls.cinvcode, + dls.cinvname, + cinvstd, + iquantity, + inum, + inv.ccomunitcode, + comUnit.ccomunitname, + casscomunitcode, + assUnit.ccomunitname as 'casscomunitname', + cmemo, + irowno, + iorderrowno, + csocode, + dls.itaxrate + + + + diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java new file mode 100644 index 00000000..0a2ea91f --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.java @@ -0,0 +1,142 @@ +package com.hzya.frame.u8.delivery.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Description U8发货单 + * @Author xiangerlin + * @Date 2024/8/22 15:04 + **/ +public class DeliveryOrderEntity extends BaseEntity { + + //主键 + private String dlid; + //发货单号 + private String cdlcode; + //客户编码 + private String ccuscode; + //客户名称 + private String ccusname; + //销售订单号 + private String csocode; + //发货日期 + private String ddate; + //制单人 + private String cmaker; + //制单时间 + private String dcreatesystime; + //币种 + private String cexch_name; + //汇率 + private String iexchrate; + //税率 + private String itaxrate; + //备注 + private String cmemo; + + //退货标记。 0发货 1退货 + private String bReturnFlag; + public String getDlid() { + return dlid; + } + + public void setDlid(String dlid) { + this.dlid = dlid; + } + + public String getCdlcode() { + return cdlcode; + } + + public void setCdlcode(String cdlcode) { + this.cdlcode = cdlcode; + } + + public String getCcuscode() { + return ccuscode; + } + + public void setCcuscode(String ccuscode) { + this.ccuscode = ccuscode; + } + + public String getCcusname() { + return ccusname; + } + + public void setCcusname(String ccusname) { + this.ccusname = ccusname; + } + + public String getCsocode() { + return csocode; + } + + public void setCsocode(String csocode) { + this.csocode = csocode; + } + + public String getDdate() { + return ddate; + } + + public void setDdate(String ddate) { + this.ddate = ddate; + } + + public String getCmaker() { + return cmaker; + } + + public void setCmaker(String cmaker) { + this.cmaker = cmaker; + } + + public String getDcreatesystime() { + return dcreatesystime; + } + + public void setDcreatesystime(String dcreatesystime) { + this.dcreatesystime = dcreatesystime; + } + + public String getCexch_name() { + return cexch_name; + } + + public void setCexch_name(String cexch_name) { + this.cexch_name = cexch_name; + } + + public String getIexchrate() { + return iexchrate; + } + + public void setIexchrate(String iexchrate) { + this.iexchrate = iexchrate; + } + + public String getItaxrate() { + return itaxrate; + } + + public void setItaxrate(String itaxrate) { + this.itaxrate = itaxrate; + } + + public String getCmemo() { + return cmemo; + } + + public void setCmemo(String cmemo) { + this.cmemo = cmemo; + } + + public String getbReturnFlag() { + return bReturnFlag; + } + + public void setbReturnFlag(String bReturnFlag) { + this.bReturnFlag = bReturnFlag; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml new file mode 100644 index 00000000..0a99f472 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + dlid, + cdlcode, + ccuscode, + ccusname, + csocode, + ddate, + cmaker, + dcreatesystime, + cexch_name, + iexchrate, + itaxrate, + cmemo + + + + diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/service/DeliveryMapper.java b/service/src/main/java/com/hzya/frame/u8/delivery/service/DeliveryMapper.java new file mode 100644 index 00000000..759d8a99 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/service/DeliveryMapper.java @@ -0,0 +1,42 @@ +package com.hzya.frame.u8.delivery.service; + +import com.hzya.frame.u8.delivery.dto.DeliveryDetailDTO; +import com.hzya.frame.u8.delivery.dto.DeliveryOrderDTO; +import com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity; +import com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @Description 转换器， entity转dto用 + * @Author xiangerlin + * @Date 2024/8/22 17:45 + **/ +@Mapper +public interface DeliveryMapper { + + DeliveryMapper INSTANCE = Mappers.getMapper(DeliveryMapper.class); + + /** + * 发货单entity转换成dto + * @param entity + * @return + */ + DeliveryOrderDTO deliveryEntityToDto(DeliveryOrderEntity entity); + + /** + * 发货单明细行转换成dto + * @param entity + * @return + */ + DeliveryDetailDTO deliveryDetailEntityToDto(DeliveryDetailEntity entity); + + /** + * 发货单明细行列表转成dto + * @param list + * @return + */ + List deliveryDetailListToDto(List list); +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryDetaiService.java b/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryDetaiService.java new file mode 100644 index 00000000..3452c01c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryDetaiService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.u8.delivery.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity; + +/** + * @Description u8发货单明细行 + * @Author xiangerlin + * @Date 2024/8/22 16:26 + **/ +public interface IDeliveryDetaiService extends IBaseService { +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryOrderService.java b/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryOrderService.java new file mode 100644 index 00000000..c1899285 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/service/IDeliveryOrderService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.u8.delivery.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity; + +/** + * @Description U8发货单 + * @Author xiangerlin + * @Date 2024/8/22 15:12 + **/ +public interface IDeliveryOrderService extends IBaseService { +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryDetaiServiceImpl.java b/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryDetaiServiceImpl.java new file mode 100644 index 00000000..a99bbfef --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryDetaiServiceImpl.java @@ -0,0 +1,29 @@ +package com.hzya.frame.u8.delivery.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.u8.delivery.dao.IDeliveryDetailDao; +import com.hzya.frame.u8.delivery.dao.IDeliveryOrderDao; +import com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity; +import com.hzya.frame.u8.delivery.service.IDeliveryDetaiService; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description u8发货单明细行 + * @Author xiangerlin + * @Date 2024/8/22 16:27 + **/ +@Service() +public class DeliveryDetaiServiceImpl extends BaseService implements IDeliveryDetaiService { + Logger logger = LogManager.getLogger(getClass()); + private IDeliveryDetailDao deliveryDetailDao; + + @Autowired + public void setDeliveryDetailDao(IDeliveryDetailDao dao) { + this.deliveryDetailDao = dao; + this.dao = dao; + } + +} diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryOrderServiceImpl.java b/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryOrderServiceImpl.java new file mode 100644 index 00000000..d2e8e5c9 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/delivery/service/impl/DeliveryOrderServiceImpl.java @@ -0,0 +1,27 @@ +package com.hzya.frame.u8.delivery.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.u8.delivery.dao.IDeliveryOrderDao; +import com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity; +import com.hzya.frame.u8.delivery.service.IDeliveryOrderService; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description U8发货单 + * @Author xiangerlin + * @Date 2024/8/22 15:13 + **/ +@Service +public class DeliveryOrderServiceImpl extends BaseService implements IDeliveryOrderService { + Logger logger = LogManager.getLogger(getClass()); + private IDeliveryOrderDao deliveryOrderDao; + + @Autowired + public void setDeliveryOrderDao(IDeliveryOrderDao dao) { + this.deliveryOrderDao = dao; + this.dao = dao; + } +} From a4e1250a0a4150d2db8368de34ccf852cd3e393b Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Thu, 22 Aug 2024 18:40:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mapstruct=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=202024=E5=B9=B48=E6=9C=8822=E6=97=A518:40:46?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 73a24eaf..ebcdc699 100644 --- a/pom.xml +++ b/pom.xml @@ -383,6 +383,17 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.mapstruct + mapstruct + 1.4.2.Final + + + org.mapstruct + mapstruct-processor + 1.4.2.Final + provided + From 73bed70c3bed79cf8c06021d56d239351fb02ade Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 23 Aug 2024 11:34:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?u8=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E3=80=81=E5=8F=91=E8=B4=A7=E5=8D=95=E5=90=8C=E6=AD=A5wms?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=202024=E5=B9=B48=E6=9C=882?= =?UTF-8?q?3=E6=97=A511:34:28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../u8/delivery/dto/DeliveryOrderDTO.java | 15 +++ .../frame/u8/production/dao/IMomOrderDao.java | 12 +++ .../u8/production/dao/IMomOrderDetailDao.java | 12 +++ .../production/dao/impl/MomOrderDaoImpl.java | 15 +++ .../dao/impl/MomOrderDetailDaoImpl.java | 15 +++ .../frame/u8/production/dto/MomOrderDTO.java | 68 ++++++++++++++ .../u8/production/dto/MomOrderDetailDTO.java | 88 ++++++++++++++++++ .../entity/MomOrderDetailEntity.java | 91 +++++++++++++++++++ .../entity/MomOrderDetailEntity.xml | 38 ++++++++ .../u8/production/entity/MomOrderEntity.java | 51 +++++++++++ .../u8/production/entity/MomOrderEntity.xml | 27 ++++++ .../service/IMomOrderDetailService.java | 12 +++ .../production/service/IMomOrderService.java | 12 +++ .../u8/production/service/MomOrderMapper.java | 35 +++++++ .../impl/MomOrderDetailServiceImpl.java | 26 ++++++ .../service/impl/MomOrderServiceImpl.java | 26 ++++++ 16 files changed, 543 insertions(+) create mode 100644 service/src/main/java/com/hzya/frame/u8/production/dao/IMomOrderDao.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/dao/IMomOrderDetailDao.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/dao/impl/MomOrderDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/dao/impl/MomOrderDetailDaoImpl.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDTO.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDetailDTO.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml create mode 100644 service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderDetailService.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderService.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/service/MomOrderMapper.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderDetailServiceImpl.java create mode 100644 service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderServiceImpl.java diff --git a/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java b/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java index a9072c4e..69d17c1e 100644 --- a/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java +++ b/service/src/main/java/com/hzya/frame/u8/delivery/dto/DeliveryOrderDTO.java @@ -1,5 +1,7 @@ package com.hzya.frame.u8.delivery.dto; +import com.alibaba.fastjson.annotation.JSONField; + import java.util.List; /** @@ -8,30 +10,43 @@ import java.util.List; * @Date 2024/8/22 17:01 **/ public class DeliveryOrderDTO { + @JSONField(serialize = false) private String dlid; //发货单号 + @JSONField(ordinal = 1) private String cdlcode; //客户编码 + @JSONField(ordinal = 2) private String ccuscode; //客户名称 + @JSONField(ordinal = 3) private String ccusname; //销售订单号 + @JSONField(ordinal = 4) private String csocode; //发货日期 + @JSONField(ordinal = 5) private String ddate; //制单人 + @JSONField(ordinal = 6) private String cmaker; //制单时间 + @JSONField(ordinal = 7) private String dcreatesystime; //币种 + @JSONField(ordinal = 8) private String cexch_name; //汇率 + @JSONField(ordinal = 9) private String iexchrate; //税率 + @JSONField(ordinal = 10) private String itaxrate; //备注 + @JSONField(ordinal = 11) private String cmemo; //子表 + @JSONField(ordinal = 12) private List itesm; public String getDlid() { diff --git a/service/src/main/java/com/hzya/frame/u8/production/dao/IMomOrderDao.java b/service/src/main/java/com/hzya/frame/u8/production/dao/IMomOrderDao.java new file mode 100644 index 00000000..19f7e01c --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/dao/IMomOrderDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.u8.production.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.u8.production.entity.MomOrderEntity; + +/** + * @Description u8生产订单表头 + * @Author xiangerlin + * @Date 2024/8/23 08:49 + **/ +public interface IMomOrderDao extends IBaseDao { +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/dao/IMomOrderDetailDao.java b/service/src/main/java/com/hzya/frame/u8/production/dao/IMomOrderDetailDao.java new file mode 100644 index 00000000..bada2661 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/dao/IMomOrderDetailDao.java @@ -0,0 +1,12 @@ +package com.hzya.frame.u8.production.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.u8.production.entity.MomOrderDetailEntity; + +/** + * @Description u8生产订单表体 + * @Author xiangerlin + * @Date 2024/8/23 09:00 + **/ +public interface IMomOrderDetailDao extends IBaseDao { +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/dao/impl/MomOrderDaoImpl.java b/service/src/main/java/com/hzya/frame/u8/production/dao/impl/MomOrderDaoImpl.java new file mode 100644 index 00000000..f2d8d4da --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/dao/impl/MomOrderDaoImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.u8.production.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.u8.production.dao.IMomOrderDao; +import com.hzya.frame.u8.production.entity.MomOrderEntity; +import org.springframework.stereotype.Repository; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/8/23 08:50 + **/ +@Repository +public class MomOrderDaoImpl extends MybatisGenericDao implements IMomOrderDao { +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/dao/impl/MomOrderDetailDaoImpl.java b/service/src/main/java/com/hzya/frame/u8/production/dao/impl/MomOrderDetailDaoImpl.java new file mode 100644 index 00000000..01441c1e --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/dao/impl/MomOrderDetailDaoImpl.java @@ -0,0 +1,15 @@ +package com.hzya.frame.u8.production.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.u8.production.dao.IMomOrderDetailDao; +import com.hzya.frame.u8.production.entity.MomOrderDetailEntity; +import org.springframework.stereotype.Repository; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/8/23 09:01 + **/ +@Repository +public class MomOrderDetailDaoImpl extends MybatisGenericDao implements IMomOrderDetailDao { +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDTO.java b/service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDTO.java new file mode 100644 index 00000000..5400782f --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDTO.java @@ -0,0 +1,68 @@ +package com.hzya.frame.u8.production.dto; + + +import com.alibaba.fastjson.annotation.JSONField; + +import java.util.List; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/8/23 09:09 + **/ +public class MomOrderDTO { + @JSONField(ordinal = 1) + //主键 + private String moId; + //生产订单号 + @JSONField(ordinal = 2) + private String mocode; + //制单日期 + @JSONField(ordinal = 3) + private String createtime; + //制单人 + @JSONField(ordinal = 4) + private String createuser; + //表体 + @JSONField(ordinal = 5) + private List itesm; + public String getMoId() { + return moId; + } + + public void setMoId(String moId) { + this.moId = moId; + } + + public String getMocode() { + return mocode; + } + + public void setMocode(String mocode) { + this.mocode = mocode; + } + + public String getCreatetime() { + return createtime; + } + + public void setCreatetime(String createtime) { + this.createtime = createtime; + } + + public String getCreateuser() { + return createuser; + } + + public void setCreateuser(String createuser) { + this.createuser = createuser; + } + + public List getItesm() { + return itesm; + } + + public void setItesm(List itesm) { + this.itesm = itesm; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDetailDTO.java b/service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDetailDTO.java new file mode 100644 index 00000000..b14503fc --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/dto/MomOrderDetailDTO.java @@ -0,0 +1,88 @@ +package com.hzya.frame.u8.production.dto; + +import com.alibaba.fastjson.annotation.JSONField; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/8/23 09:09 + **/ +public class MomOrderDetailDTO { + //存货编码 + @JSONField(ordinal = 1) + private String cinvcode; + //存货名称 + @JSONField(ordinal = 2) + private String cinvname; + //规格型号 + @JSONField(ordinal = 3) + private String cinvstd; + //数量 + @JSONField(ordinal = 4) + private String qty; + //件数 + @JSONField(ordinal = 5) + private String auxqty; + //部门名称 + @JSONField(ordinal = 6) + private String mdeptname; + //部门编码 + @JSONField(ordinal = 7) + private String mdeptcode; + + public String getCinvcode() { + return cinvcode; + } + + public void setCinvcode(String cinvcode) { + this.cinvcode = cinvcode; + } + + public String getCinvname() { + return cinvname; + } + + public void setCinvname(String cinvname) { + this.cinvname = cinvname; + } + + public String getCinvstd() { + return cinvstd; + } + + public void setCinvstd(String cinvstd) { + this.cinvstd = cinvstd; + } + + public String getQty() { + return qty; + } + + public void setQty(String qty) { + this.qty = qty; + } + + public String getAuxqty() { + return auxqty; + } + + public void setAuxqty(String auxqty) { + this.auxqty = auxqty; + } + + public String getMdeptname() { + return mdeptname; + } + + public void setMdeptname(String mdeptname) { + this.mdeptname = mdeptname; + } + + public String getMdeptcode() { + return mdeptcode; + } + + public void setMdeptcode(String mdeptcode) { + this.mdeptcode = mdeptcode; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.java b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.java new file mode 100644 index 00000000..03566545 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.java @@ -0,0 +1,91 @@ +package com.hzya.frame.u8.production.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Description u8生产订单表体 mom_orderdetail + * @Author xiangerlin + * @Date 2024/8/23 08:57 + **/ +public class MomOrderDetailEntity extends BaseEntity { + //主表id + private String moId; + //存货编码 + private String cinvcode; + //存货名称 + private String cinvname; + //规格型号 + private String cinvstd; + //数量 + private String qty; + //件数 + private String auxqty; + //部门名称 + private String mdeptname; + //部门编码 + private String mdeptcode; + + public String getMoId() { + return moId; + } + + public void setMoId(String moId) { + this.moId = moId; + } + + public String getCinvcode() { + return cinvcode; + } + + public void setCinvcode(String cinvcode) { + this.cinvcode = cinvcode; + } + + public String getCinvname() { + return cinvname; + } + + public void setCinvname(String cinvname) { + this.cinvname = cinvname; + } + + public String getCinvstd() { + return cinvstd; + } + + public void setCinvstd(String cinvstd) { + this.cinvstd = cinvstd; + } + + public String getQty() { + return qty; + } + + public void setQty(String qty) { + this.qty = qty; + } + + public String getAuxqty() { + return auxqty; + } + + public void setAuxqty(String auxqty) { + this.auxqty = auxqty; + } + + public String getMdeptname() { + return mdeptname; + } + + public void setMdeptname(String mdeptname) { + this.mdeptname = mdeptname; + } + + public String getMdeptcode() { + return mdeptcode; + } + + public void setMdeptcode(String mdeptcode) { + this.mdeptcode = mdeptcode; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.xml b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.xml new file mode 100644 index 00000000..a687d736 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderDetailEntity.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + MoId, + invCode as 'cinvcode', + cinvname, + cinvstd, + qty, + auxqty, + dep.cDepName as 'mdeptname', + mdeptcode + + + + diff --git a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java new file mode 100644 index 00000000..a535afb0 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.java @@ -0,0 +1,51 @@ +package com.hzya.frame.u8.production.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Description u8生产订单表头 mom_order + * @Author xiangerlin + * @Date 2024/8/23 08:46 + **/ +public class MomOrderEntity extends BaseEntity { + //主键 + private String moId; + //生产订单号 + private String mocode; + //制单日期 + private String createtime; + //制单人 + private String createuser; + + public String getMoId() { + return moId; + } + + public void setMoId(String moId) { + this.moId = moId; + } + + public String getMocode() { + return mocode; + } + + public void setMocode(String mocode) { + this.mocode = mocode; + } + + public String getCreatetime() { + return createtime; + } + + public void setCreatetime(String createtime) { + this.createtime = createtime; + } + + public String getCreateuser() { + return createuser; + } + + public void setCreateuser(String createuser) { + this.createuser = createuser; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml new file mode 100644 index 00000000..01db99ce --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/entity/MomOrderEntity.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + moId, + mocode, + createtime, + createuser + + + + diff --git a/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderDetailService.java b/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderDetailService.java new file mode 100644 index 00000000..8eca5090 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderDetailService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.u8.production.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.u8.production.entity.MomOrderDetailEntity; + +/** + * @Description u8生产订单表体 + * @Author xiangerlin + * @Date 2024/8/23 09:02 + **/ +public interface IMomOrderDetailService extends IBaseService { +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderService.java b/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderService.java new file mode 100644 index 00000000..2c18bdc1 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/service/IMomOrderService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.u8.production.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.u8.production.entity.MomOrderEntity; + +/** + * @Description u8生产订单表头 + * @Author xiangerlin + * @Date 2024/8/23 08:54 + **/ +public interface IMomOrderService extends IBaseService { +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/service/MomOrderMapper.java b/service/src/main/java/com/hzya/frame/u8/production/service/MomOrderMapper.java new file mode 100644 index 00000000..dac76d0a --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/service/MomOrderMapper.java @@ -0,0 +1,35 @@ +package com.hzya.frame.u8.production.service; + +import com.hzya.frame.u8.production.dto.MomOrderDTO; +import com.hzya.frame.u8.production.dto.MomOrderDetailDTO; +import com.hzya.frame.u8.production.entity.MomOrderDetailEntity; +import com.hzya.frame.u8.production.entity.MomOrderEntity; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @Description entity转换成 dto + * @Author xiangerlin + * @Date 2024/8/23 09:10 + **/ +@Mapper +public interface MomOrderMapper { + + MomOrderMapper INSTANCE = Mappers.getMapper(MomOrderMapper.class); + + /** + * 生产订单entity转dto + * @param entity + * @return + */ + MomOrderDTO momOrderEntityToDto(MomOrderEntity entity); + + /** + * 生产订单明细行列表转dto + * @param list + * @return + */ + List momOrderDetailListToDto(List list); +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderDetailServiceImpl.java b/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderDetailServiceImpl.java new file mode 100644 index 00000000..437bb178 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderDetailServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.u8.production.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.u8.production.dao.IMomOrderDetailDao; +import com.hzya.frame.u8.production.entity.MomOrderDetailEntity; +import com.hzya.frame.u8.production.service.IMomOrderDetailService; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description + * @Author xiangerlin + * @Date 2024/8/23 09:03 + **/ +@Service +public class MomOrderDetailServiceImpl extends BaseService implements IMomOrderDetailService { + Logger logger = LogManager.getLogger(getClass()); + private IMomOrderDetailDao momOrderDetailDao; + @Autowired + public void setMomOrderDetailDao(IMomOrderDetailDao dao) { + this.momOrderDetailDao = dao; + this.dao = dao; + } +} diff --git a/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderServiceImpl.java b/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderServiceImpl.java new file mode 100644 index 00000000..6edba2f7 --- /dev/null +++ b/service/src/main/java/com/hzya/frame/u8/production/service/impl/MomOrderServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.u8.production.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.u8.production.dao.IMomOrderDao; +import com.hzya.frame.u8.production.entity.MomOrderEntity; +import com.hzya.frame.u8.production.service.IMomOrderService; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description u8生产订单表头 + * @Author xiangerlin + * @Date 2024/8/23 08:56 + **/ +@Service +public class MomOrderServiceImpl extends BaseService implements IMomOrderService { + Logger logger = LogManager.getLogger(getClass()); + private IMomOrderDao momOrderDao; + @Autowired + public void setMomOrderDao(IMomOrderDao dao) { + this.momOrderDao = dao; + this.dao = dao; + } +} From e6fa8f9f9b90bc28a9a2fa5e173a12c54574d559 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 23 Aug 2024 11:35:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E3=80=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E6=8F=92=E4=BB=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=202024=E5=B9=B48=E6=9C=8823?= =?UTF-8?q?=E6=97=A511:35:08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml | 1 + .../cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml index 3cf0fef9..7ad2d02d 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml @@ -2,4 +2,5 @@ + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml index af24ff3a..f90aeedf 100644 --- a/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml +++ b/buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml @@ -2,4 +2,5 @@ + From 1a82f55e41ca5883dae63004728ef819204abf7a Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Fri, 23 Aug 2024 11:36:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=97=A5=E5=BF=97=E4=BF=9D=E5=AD=98=202024?= =?UTF-8?q?=E5=B9=B48=E6=9C=8823=E6=97=A511:36:33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeliveryOrderPluginInitializer.java | 14 ++- .../kjs/plugin/MomOrderPluginInitializer.java | 103 +++++++++++++++++ .../kjs/service/IMomOrderPluginService.java | 18 +++ .../impl/DeliveryOrderPluginServiceImpl.java | 92 ++++++++++----- .../impl/MomOrderPluginServiceImpl.java | 107 ++++++++++++++++++ 5 files changed, 300 insertions(+), 34 deletions(-) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/MomOrderPluginInitializer.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/IMomOrderPluginService.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java index cf364401..16f180eb 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/DeliveryOrderPluginInitializer.java @@ -2,9 +2,12 @@ package com.hzya.frame.plugin.kjs.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.plugin.kjs.service.IDeliveryOrderPluginService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; /** * @Description @@ -13,6 +16,8 @@ import org.slf4j.LoggerFactory; **/ public class DeliveryOrderPluginInitializer extends PluginBaseEntity { Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private IDeliveryOrderPluginService deliveryOrderPluginService; /*** * 插件初始化方法 * @Author 👻👻👻👻👻👻👻👻 gjh @@ -55,7 +60,7 @@ public class DeliveryOrderPluginInitializer extends PluginBaseEntity { **/ @Override public String getPluginName() { - return "kjs发货单同步插件"; + return "kjs发货单同步WMS插件"; } /**** @@ -66,7 +71,7 @@ public class DeliveryOrderPluginInitializer extends PluginBaseEntity { **/ @Override public String getPluginLabel() { - return "kjs发货单同步插件"; + return "kjs发货单同步WMS插件"; } /*** @@ -90,7 +95,8 @@ public class DeliveryOrderPluginInitializer extends PluginBaseEntity { **/ @Override public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { - - return null; + logger.info("开始执行"+getPluginName()); + String res = deliveryOrderPluginService.sync2wms(requestJson); + return BaseResult.getSuccessMessageEntity("操作成功"); } } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/MomOrderPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/MomOrderPluginInitializer.java new file mode 100644 index 00000000..18dffa00 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/plugin/MomOrderPluginInitializer.java @@ -0,0 +1,103 @@ +package com.hzya.frame.plugin.kjs.plugin; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.plugin.kjs.service.IMomOrderPluginService; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description u8生产订单同步wms + * @Author xiangerlin + * @Date 2024/8/23 09:17 + **/ +public class MomOrderPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private IMomOrderPluginService momOrderPluginService; + /*** + * 插件初始化方法 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-02 10:48 + * @Param [] + * @return void + **/ + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + /**** + * 插件销毁方法 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + /**** + * 插件的ID + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginId() { + return "kjsMomOrderPlugin"; + } + + /**** + * 插件的名称 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginName() { + return "kjs生产订单同步WMS插件"; + } + + /**** + * 插件的显示值 + * @author 👻👻👻👻👻👻👻👻 gjh + * @date 2023-08-02 10:48 + * @return void + **/ + @Override + public String getPluginLabel() { + return "kjs生产订单同步WMS插件"; + } + + /*** + * 插件类型 1、场景插件 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-02 14:01 + * @Param [] + * @return java.lang.String + **/ + @Override + public String getPluginType() { + return "1"; + } + + /*** + * 执行业务代码 + * @Author 👻👻👻👻👻👻👻👻 gjh + * @Date 2023-08-07 11:20 + * @param requestJson 执行业务代码的参数 + * @return void + **/ + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + logger.info("开始执行"+getPluginName()); + momOrderPluginService.sync2wms(requestJson); + return BaseResult.getSuccessMessageEntity("执行成功"); + } +} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/IMomOrderPluginService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/IMomOrderPluginService.java new file mode 100644 index 00000000..4e0207cc --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/IMomOrderPluginService.java @@ -0,0 +1,18 @@ +package com.hzya.frame.plugin.kjs.service; + +import com.alibaba.fastjson.JSONObject; + +/** + * @Description 生产订单同步wsm + * @Author xiangerlin + * @Date 2024/8/23 09:21 + **/ +public interface IMomOrderPluginService { + + /** + * 生产订单单同步到wms + * @param requestJson + * @return + */ + String sync2wms(JSONObject requestJson); +} 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 64c8d69d..73254486 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 @@ -1,9 +1,12 @@ package com.hzya.frame.plugin.kjs.service.impl; import cn.hutool.core.map.MapBuilder; +import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.plugin.kjs.service.IDeliveryOrderPluginService; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; import com.hzya.frame.u8.delivery.dto.DeliveryDetailDTO; import com.hzya.frame.u8.delivery.dto.DeliveryOrderDTO; import com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity; @@ -16,6 +19,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import java.util.Date; import java.util.List; import java.util.Map; @@ -30,7 +35,8 @@ public class DeliveryOrderPluginServiceImpl implements IDeliveryOrderPluginServi private IDeliveryOrderService deliveryOrderService; @Autowired private IDeliveryDetaiService deliveryDetaiService; - + @Resource + private IIntegrationTaskLivingDetailsService taskLivingDetailsService; /** * 发货单同步到wsm * @param requestJson @@ -38,35 +44,61 @@ public class DeliveryOrderPluginServiceImpl implements IDeliveryOrderPluginServi */ @Override public String sync2wms(JSONObject requestJson) { - //1 查询发货单主表 - DeliveryOrderEntity orderEntity = new DeliveryOrderEntity(); - orderEntity.setDataSourceCode("YONYOUU8"); - orderEntity.setDlid("1000000152"); - orderEntity.setbReturnFlag("0"); - List orderList = deliveryOrderService.query(orderEntity); - if (CollectionUtils.isNotEmpty(orderList)){ - for (DeliveryOrderEntity order : orderList) { - //2 查询发货单明细表 - DeliveryDetailEntity detailEntity = new DeliveryDetailEntity(); - detailEntity.setDlid(order.getDlid()); - detailEntity.setDataSourceCode("YONYOUU8"); - List detailList = deliveryDetaiService.query(detailEntity); - //发货单表头entity转dto - DeliveryOrderDTO deliveryOrderDTO = DeliveryMapper.INSTANCE.deliveryEntityToDto(order); - //发货单表体entity转dto - List deliveryDetailList = DeliveryMapper.INSTANCE.deliveryDetailListToDto(detailList); - deliveryOrderDTO.setItesm(deliveryDetailList); - String reqParams = JSONObject.toJSONString(deliveryOrderDTO); - logger.info("发货单请求参数:{}",reqParams); - //调用wms接口 - Map headerMap = MapBuilder.create(true) - .put("apiCode", "") - .put("publicKey","ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj") - .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") - .put("appId","") - .build(); - String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(reqParams).timeout(60000).execute().body(); - return body; + if (null != requestJson){ + //1 查询发货单主表 + DeliveryOrderEntity orderEntity = new DeliveryOrderEntity(); + String id = requestJson.getString("integration_task_living_details_id"); + if (StrUtil.isNotEmpty(id)){ + IntegrationTaskLivingDetailsEntity taskLivingDetails = taskLivingDetailsService.get(id); + orderEntity.setDlid(taskLivingDetails.getRootAppPk()); + } + orderEntity.setDataSourceCode("YONYOUU8"); + orderEntity.setDlid("1000000152"); + orderEntity.setbReturnFlag("0"); + List orderList = deliveryOrderService.query(orderEntity); + if (CollectionUtils.isNotEmpty(orderList)){ + for (DeliveryOrderEntity order : orderList) { + try { + //2 查询发货单明细表 + DeliveryDetailEntity detailEntity = new DeliveryDetailEntity(); + detailEntity.setDlid(order.getDlid()); + detailEntity.setDataSourceCode("YONYOUU8"); + List detailList = deliveryDetaiService.query(detailEntity); + //发货单表头entity转dto + DeliveryOrderDTO deliveryOrderDTO = DeliveryMapper.INSTANCE.deliveryEntityToDto(order); + //发货单表体entity转dto + List deliveryDetailList = DeliveryMapper.INSTANCE.deliveryDetailListToDto(detailList); + deliveryOrderDTO.setItesm(deliveryDetailList); + String reqParams = JSONObject.toJSONString(deliveryOrderDTO); + logger.info("发货单请求参数:{}",reqParams); + //调用wms接口 + Map headerMap = MapBuilder.create(true) + .put("apiCode", "") + .put("publicKey","ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj") + .put("secretKey","7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") + .put("appId","") + .build(); + //String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(reqParams).timeout(60000).execute().body(); + //保存日志 + IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity(); + taskLivingDetail.setCreate_time(new Date()); + taskLivingDetail.setModify_time(new Date()); + taskLivingDetail.setRootAppPk(order.getDlid()); + taskLivingDetail.setRootAppBill(order.getCdlcode()); + taskLivingDetail.setPluginId("kjsDeliveryOrderPlugin"); + taskLivingDetail.setRootAppNewData(reqParams); + //判断，成功调用这个方法 + //taskLivingDetailsService.saveLogToSuccess(taskLivingDetail); + //失败 调用这个方法 + //taskLivingDetailsService.saveLogToFail(taskLivingDetail); + //如果是重试 成功调这个方法 + //taskLivingDetailsService.saveLogFailToSuccess(taskLivingDetail); + //如果是重试 失败调这个方法 + // taskLivingDetailsService.updateLogFailToSuccess(taskLivingDetail); + }catch(Exception e){ + logger.error("同步发货单到wsm出错:{}",e); + } + } } } 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 new file mode 100644 index 00000000..bd60154a --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/kjs/service/impl/MomOrderPluginServiceImpl.java @@ -0,0 +1,107 @@ +package com.hzya.frame.plugin.kjs.service.impl; + +import cn.hutool.core.map.MapBuilder; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.plugin.kjs.service.IMomOrderPluginService; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService; +import com.hzya.frame.u8.production.dto.MomOrderDTO; +import com.hzya.frame.u8.production.dto.MomOrderDetailDTO; +import com.hzya.frame.u8.production.entity.MomOrderDetailEntity; +import com.hzya.frame.u8.production.entity.MomOrderEntity; +import com.hzya.frame.u8.production.service.IMomOrderDetailService; +import com.hzya.frame.u8.production.service.IMomOrderService; +import com.hzya.frame.u8.production.service.MomOrderMapper; +import org.apache.commons.collections.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @Description 生产订单同步wsm + * @Author xiangerlin + * @Date 2024/8/23 09:21 + **/ +public class MomOrderPluginServiceImpl implements IMomOrderPluginService { + Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private IMomOrderService momOrderService; + @Autowired + private IMomOrderDetailService momOrderDetailService; + @Resource + private IIntegrationTaskLivingDetailsService taskLivingDetailsService; + /** + * 生产订单单同步到wms + * + * @param requestJson + * @return + */ + @Override + public String sync2wms(JSONObject requestJson) { + if (null != requestJson){ + //1查询主表 + MomOrderEntity entity = new MomOrderEntity(); + String id = requestJson.getString("integration_task_living_details_id"); + //如果这个id不为空说明是重试 + if (StrUtil.isNotEmpty(id)){ + IntegrationTaskLivingDetailsEntity taskLivingDetails = taskLivingDetailsService.get(id); + entity.setMoId(taskLivingDetails.getRootAppPk()); + } + entity.setMoId("1000000001"); + entity.setDataSourceCode("YONYOUU8"); + List orderList = momOrderService.query(entity); + if (CollectionUtils.isNotEmpty(orderList)){ + for (MomOrderEntity order : orderList) { + try { + //查询生产订单明细表 + MomOrderDetailEntity detailEntity = new MomOrderDetailEntity(); + detailEntity.setMoId(order.getMoId()); + detailEntity.setDataSourceCode("YONYOUU8"); + List detailList = momOrderDetailService.query(detailEntity); + //表头转换dto + MomOrderDTO momOrderDTO = MomOrderMapper.INSTANCE.momOrderEntityToDto(order); + //表体转换dto + List momOrderDetailList = MomOrderMapper.INSTANCE.momOrderDetailListToDto(detailList); + momOrderDTO.setItesm(momOrderDetailList); + String reqParam = JSONObject.toJSONString(momOrderDTO); + logger.info("u8生产订单传wms请求参数：{}",reqParam); + Map headerMap = MapBuilder.create(true) + .put("apiCode", "") + .put("publicKey","ZJYAWb7lhAUTYqekPkU+uHJv1/ObJxb7dT7sD8HPRDGAgyhCe7eDIk+3zDUT+v578prj") + .put("secretKey","fviZnLBsQUAGF8w8FSOdJi7XlIm/XAZclMxRagDLfTyJFlvnIBF3w66Hrpfzs8cYj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=") + .put("appId","") + .build(); + //String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface").addHeaders(headerMap).body(reqParam).timeout(60000).execute().body(); + + //保存日志 + IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity(); + taskLivingDetail.setCreate_time(new Date()); + taskLivingDetail.setModify_time(new Date()); + taskLivingDetail.setRootAppPk(order.getMoId()); + taskLivingDetail.setRootAppBill(order.getMocode()); + taskLivingDetail.setPluginId("kjsMomOrderPlugin"); + taskLivingDetail.setRootAppNewData(reqParam); + //判断，成功调用这个方法 + //taskLivingDetailsService.saveLogToSuccess(taskLivingDetail); + //失败 调用这个方法 + //taskLivingDetailsService.saveLogToFail(taskLivingDetail); + //如果是重试 成功调这个方法 + //taskLivingDetailsService.saveLogFailToSuccess(taskLivingDetail); + //如果是重试 失败调这个方法 + // taskLivingDetailsService.updateLogFailToSuccess(taskLivingDetail); + }catch (Exception e){ + logger.error("生产订单同步wsm出错:{}",e); + } + } + } + } + return null; + } +}