发货单接口

2024年8月22日18:40:17

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;
+    }
+}

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);
+}

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<DeliveryOrderEntity> 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<DeliveryDetailEntity> detailList =  deliveryDetaiService.query(detailEntity);
+                //发货单表头entity转dto
+                DeliveryOrderDTO deliveryOrderDTO = DeliveryMapper.INSTANCE.deliveryEntityToDto(order);
+                //发货单表体entity转dto
+                List<DeliveryDetailDTO> deliveryDetailList = DeliveryMapper.INSTANCE.deliveryDetailListToDto(detailList);
+                deliveryOrderDTO.setItesm(deliveryDetailList);
+                String reqParams = JSONObject.toJSONString(deliveryOrderDTO);
+                logger.info("发货单请求参数:{}",reqParams);
+                //调用wms接口
+                Map<String, String> headerMap = MapBuilder.<String, String>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;
+    }
+}

buildpackage/src/main/resources/cfgHome/plugin/kjs/pluginCfg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+<id>kjsPlugin</id>
+<name>kjs插件</name>
+<category>202408220001</category>
+</plugin>

buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-plugin.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans default-autowire="byName">
+<bean name="deliveryOrderPluginInitializer" class="com.hzya.frame.plugin.kjs.plugin.DeliveryOrderPluginInitializer" />
+</beans>

buildpackage/src/main/resources/cfgHome/plugin/kjs/spring/spring-buildpackage-service.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans default-autowire="byName">
+    <bean name="deliveryOrderPluginServiceImpl" class="com.hzya.frame.plugin.kjs.service.impl.DeliveryOrderPluginServiceImpl" />
+</beans>

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<DeliveryDetailEntity,String> {
+}

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<DeliveryOrderEntity,String> {
+}

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<DeliveryDetailEntity,String> implements IDeliveryDetailDao {
+}

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<DeliveryOrderEntity,String> implements IDeliveryOrderDao {
+}

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;
+    }
+}

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<DeliveryDetailDTO> 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<DeliveryDetailDTO> getItesm() {
+        return itesm;
+    }
+
+    public void setItesm(List<DeliveryDetailDTO> itesm) {
+        this.itesm = itesm;
+    }
+}

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;
+    }
+}

service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryDetailEntity.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.u8.delivery.dao.impl.DeliveryDetailDaoImpl">
+    <resultMap id="get-entity-result" type="com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity">
+        <result property="dlid" column="dlid" />
+        <result property="cwhcode" column="cwhcode" />
+        <result property="cwhname" column="cwhname" />
+        <result property="cinvcode" column="cinvcode" />
+        <result property="cinvname" column="cinvname" />
+        <result property="cinvstd" column="cinvstd" />
+        <result property="iquantity" column="iquantity" />
+        <result property="inum" column="inum" />
+        <result property="ccomunitcode" column="ccomunitcode" />
+        <result property="ccomunitname" column="ccomunitname" />
+        <result property="casscomunitcode" column="casscomunitcode" />
+        <result property="casscomunitname" column="casscomunitname" />
+        <result property="cmemo" column="cmemo" />
+        <result property="irowno" column="irowno" />
+        <result property="iorderrowno" column="iorderrowno" />
+        <result property="csocode" column="csocode" />
+        <result property="itaxrate" column="itaxrate" />
+    </resultMap>
+    <sql id="DeliveryDetailEntity_Base_Column_List">
+         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
+    </sql>
+
+    <select id="entity_list_base" resultMap="get-entity-result" parameterType="com.hzya.frame.u8.delivery.entity.DeliveryDetailEntity">
+        select
+        <include refid="DeliveryDetailEntity_Base_Column_List" />
+        from DispatchLists dls
+        left join Warehouse wh on wh.cWhCode = dls.cWhCode
+        left join inventory inv on inv.cInvCode = dls.cInvCode
+        left join ComputationUnit comUnit on comUnit.cComunitCode = inv.cComUnitCode
+        left join ComputationUnit assUnit on assUnit.cComunitCode = inv.cAssComUnitCode
+        <trim prefix="where" prefixOverrides="and">
+            <if test="dlid != null ">dls.DLID = #{dlid} </if>
+            <if test="cwhcode != null and cwhcode !='' "> and dls.cwhcode = #{cwhcode} </if>
+        </trim>
+        order by dlid,irowno
+    </select>
+</mapper>

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;
+    }
+}

service/src/main/java/com/hzya/frame/u8/delivery/entity/DeliveryOrderEntity.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.u8.delivery.dao.impl.DeliveryOrderDaoImpl">
+    <resultMap id="get-entity-result" type="com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity">
+        <result property="dlid" column="dlid" />
+        <result property="cdlcode" column="cdlcode" />
+        <result property="ccuscode" column="ccuscode" />
+        <result property="ccusname" column="ccusname" />
+        <result property="csocode" column="csocode" />
+        <result property="ddate" column="ddate" />
+        <result property="cmaker" column="cmaker" />
+        <result property="dcreatesystime" column="dcreatesystime" />
+        <result property="cexch_name" column="cexch_name" />
+        <result property="iexchrate" column="iexchrate" />
+        <result property="itaxrate" column="itaxrate" />
+        <result property="cmemo" column="cmemo" />
+    </resultMap>
+    <sql id="DeliveryOrder_Base_Column_List">
+		dlid,
+		cdlcode,
+		ccuscode,
+		ccusname,
+		csocode,
+		ddate,
+		cmaker,
+		dcreatesystime,
+		cexch_name,
+		iexchrate,
+		itaxrate,
+		cmemo
+    </sql>
+
+	<select id="entity_list_base" resultMap="get-entity-result" parameterType="com.hzya.frame.u8.delivery.entity.DeliveryOrderEntity">
+		select
+		<include refid="DeliveryOrder_Base_Column_List" />
+		from DispatchList
+		<trim prefix="where" prefixOverrides="and">
+			<if test="dlid != null ">dlid= #{dlid} </if>
+			<if test="cdlcode != null and cdlcode !='' "> and cdlcode = #{cdlcode} </if>
+			<if test="ccuscode != null and ccuscode !='' "> and ccuscode = #{ccuscode} </if>
+			<if test="ccusname != null and ccusname !='' "> and ccusname = #{ccusname} </if>
+			<if test="csocode != null and csocode !='' "> and csocode = #{csocode} </if>
+			<if test="bReturnFlag != null and bReturnFlag !='' "> and bReturnFlag = #{bReturnFlag} </if>
+		</trim>
+		order by dlid
+	</select>
+</mapper>

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<DeliveryDetailDTO> deliveryDetailListToDto(List<DeliveryDetailEntity> list);
+}

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<DeliveryDetailEntity,String> {
+}

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<DeliveryOrderEntity,String> {
+}

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<DeliveryDetailEntity,String> implements IDeliveryDetaiService {
+    Logger logger = LogManager.getLogger(getClass());
+    private IDeliveryDetailDao deliveryDetailDao;
+
+    @Autowired
+    public void setDeliveryDetailDao(IDeliveryDetailDao dao) {
+        this.deliveryDetailDao = dao;
+        this.dao = dao;
+    }
+
+}

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<DeliveryOrderEntity,String> implements IDeliveryOrderService {
+    Logger logger = LogManager.getLogger(getClass());
+    private IDeliveryOrderDao deliveryOrderDao;
+
+    @Autowired
+    public void setDeliveryOrderDao(IDeliveryOrderDao dao) {
+        this.deliveryOrderDao = dao;
+        this.dao = dao;
+    }
+}