优化TOC日志推送功能

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsSaleoutDao.bak

@@ -0,0 +1,21 @@
+package com.hzya.frame.plugin.lets.ofs.dao;
+
+import com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+import java.util.List;
+
+/**
+ * root(tocofs_saleout: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-01 17:01:32
+ */
+public interface ITocofsSaleoutDao extends IBaseDao<TocofsSaleoutEntity, String> {
+    /**
+     * 批量插入主表信息
+     *
+     * @author liuyang
+     */
+    void entityInsertBatchV2(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception;
+}

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsSaleoutDao.java

@@ -6,16 +6,18 @@ import com.hzya.frame.basedao.dao.IBaseDao;
 import java.util.List;
 
 /**
- * root(tocofs_saleout: table)表数据库访问层
+ * O出库单表头(TOC、TOB业务底表)(tocofs_saleout: table)表数据库访问层
  *
  * @author makejava
- * @since 2024-08-01 17:01:32
+ * @since 2024-09-04 17:48:16
  */
 public interface ITocofsSaleoutDao extends IBaseDao<TocofsSaleoutEntity, String> {
+
     /**
-     * 批量插入主表信息
+     * 批量查询或者更新
      *
      * @author liuyang
      */
-    void entityInsertBatchV2(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception;
+    void entityInsertOrUpdateBatch(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception;
 }
+

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/ITocofsSaleoutDetailedDao.java

@@ -6,18 +6,18 @@ import com.hzya.frame.basedao.dao.IBaseDao;
 import java.util.List;
 
 /**
- * tocofs_saleout_detailed(tocofs_saleout_detailed: table)表数据库访问层
+ * O出库单明细表(TOC、TOB业务底表)(tocofs_saleout_detailed: table)表数据库访问层
  *
  * @author makejava
- * @since 2024-08-01 17:01:53
+ * @since 2024-09-04 17:48:28
  */
 public interface ITocofsSaleoutDetailedDao extends IBaseDao<TocofsSaleoutDetailedEntity, String> {
 
     /**
-     * 批量查询明细信息
+     * 批量插入或者更新
      *
      * @author liuyang
      */
-    void entityInsertBatchV2(List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntity) throws Exception;
+    void entityInsertOrUpdateBatch(List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntities) throws Exception;
 }
 

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsSaleoutDaoImpl.java

@@ -8,14 +8,15 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
 import java.util.List;
 
 /**
- * root(TocofsSaleout)表数据库访问层
+ * O出库单表头(TOC、TOB业务底表)(TocofsSaleout)表数据库访问层
  *
  * @author makejava
- * @since 2024-08-01 17:01:32
+ * @since 2024-09-04 17:48:16
  */
 public class TocofsSaleoutDaoImpl extends MybatisGenericDao<TocofsSaleoutEntity, String> implements ITocofsSaleoutDao {
     @Override
-    public void entityInsertBatchV2(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception {
+    public void entityInsertOrUpdateBatch(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception {
-        this.insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDaoImpl.entityInsertBatchV2", tocofsSaleoutEntityList);
+        insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDaoImpl.entityInsertOrUpdateBatch", tocofsSaleoutEntityList);
     }
 }
+

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsSaleoutDaoImpl.java.bak

@@ -0,0 +1,21 @@
+package com.hzya.frame.plugin.lets.ofs.dao.impl;
+
+import com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity;
+import com.hzya.frame.plugin.lets.ofs.dao.ITocofsSaleoutDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+
+import java.util.List;
+
+/**
+ * root(TocofsSaleout)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-01 17:01:32
+ */
+public class TocofsSaleoutDaoImpl extends MybatisGenericDao<TocofsSaleoutEntity, String> implements ITocofsSaleoutDao {
+    @Override
+    public void entityInsertBatchV2(List<TocofsSaleoutEntity> tocofsSaleoutEntityList) throws Exception {
+        this.insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDaoImpl.entityInsertBatchV2", tocofsSaleoutEntityList);
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/dao/impl/TocofsSaleoutDetailedDaoImpl.java

@@ -8,14 +8,14 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
 import java.util.List;
 
 /**
- * tocofs_saleout_detailed(TocofsSaleoutDetailed)表数据库访问层
+ * O出库单明细表(TOC、TOB业务底表)(TocofsSaleoutDetailed)表数据库访问层
  *
  * @author makejava
- * @since 2024-08-01 17:01:53
+ * @since 2024-09-04 17:48:28
  */
 public class TocofsSaleoutDetailedDaoImpl extends MybatisGenericDao<TocofsSaleoutDetailedEntity, String> implements ITocofsSaleoutDetailedDao {
     @Override
-    public void entityInsertBatchV2(List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntity) throws Exception {
+    public void entityInsertOrUpdateBatch(List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntities) throws Exception {
-        this.insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDetailedDaoImpl.entityInsertBatchV2", tocofsSaleoutDetailedEntity);
+        insert("com.hzya.frame.plugin.lets.ofs.dao.impl.TocofsSaleoutDetailedDaoImpl.entityInsertOrUpdateBatch", tocofsSaleoutDetailedEntities);
     }
 }

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java

@@ -1,18 +1,19 @@
 package com.hzya.frame.plugin.lets.ofs.entity;
 
 import com.hzya.frame.web.entity.BaseEntity;
+import lombok.Data;
 
 /**
- * tocofs_saleout_detailed(TocofsSaleoutDetailed)实体类
+ * O出库单明细表(TOC、TOB业务底表)(TocofsSaleoutDetailed)实体类
  *
  * @author makejava
- * @since 2024-08-01 17:01:53
+ * @since 2024-09-04 17:48:28
  */
+//@Data
+//2024年9月5日 11:00:32 抛出异常，There is no getter for property named 'primaryKey' in 'class com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutDetailedEntity'
+//2024年9月5日 11:05:13 没用，不是@data这里的问题
+@Data
 public class TocofsSaleoutDetailedEntity extends BaseEntity {
-    /**
-     * rootId
-     */
-//    private Long rootid;
     /**
      * LETS
      */
@@ -30,7 +31,7 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
      */
     private String shipmentcode;
     /**
-     * 22814582
+     * 22814582 主键
      */
     private Long reforderid;
     /**
@@ -57,6 +58,7 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
      * LETS-SO2024031900000002
      */
     private String sourceordercode;
+    private String sourcelinenum;
     /**
      * AVAILABLE
      */
@@ -73,6 +75,7 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
      * 0
      */
     private Long shipqty;
+    private String shipat;
     /**
      * EA
      */
@@ -125,327 +128,236 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
      * LETS-ADMIN
      */
     private String lastupdatedby;
-
-//    public Long getRootid() {
-//        return rootid;
-//    }
-//
-//    public void setRootid(Long rootid) {
-//        this.rootid = rootid;
-//    }
-
-    private String newTransmitInfo;
-
-    private String newPushDate;
-
-    private String newState;
-
-    private String newSystemNumber;
-
-    private String newSystemPrimary;
-
     /**
      * 主表主键
      */
-    private String primaryKey;
+    private String maintableid;
-
     /**
-     * 业务类型
+     * (销售)推送时间
      */
-    private String businessType;
+    private String newpushdate;
-
     /**
-     * 业务日期
+     * (销售)报错详情
      */
-    private String businessDate;
+    private String newtransmitinfo;
-
+    /**
-    public String getBusinessDate() {
+     * (销售)出库同步是否成功
-        return businessDate;
+     */
+    private String newstate;
+    /**
+     * (销售)交易成功(红)是否成功
+     */
+    private String newstate2;
+    /**
+     * (销售)交易成功(蓝)是否成功
+     */
+    private String newstate3;
+    /**
+     * (销售)交易成功(TOB发票)是否成功
+     */
+    private String newstate4;
+    /**
+     * (销售)下游系统编码(库存)
+     */
+    private String newsystemnumber;
+    /**
+     * (销售)下游系统主键(库存)
+     */
+    private String newsystemprimary;
+    /**
+     * (销售)下游系统编码(交易成功红)
+     */
+    private String newsystemnumber2;
+    /**
+     * (销售)下游系统主键(交易成功红)
+     */
+    private String newsystemprimary2;
+    /**
+     * (销售)下游系统编码(交易成功蓝)
+     */
+    private String newsystemnumber3;
+    /**
+     * (销售)下游系统主键(交易成功蓝)
+     */
+    private String newsystemprimary3;
+    /**
+     * (销售)下游系统编码(交易成功TOB发票)
+     */
+    private String newsystemnumber4;
+    /**
+     * (销售)下游系统主键(交易成功TOB发票)
+     */
+    private String newsystemprimary4;
+    /**
+     * (销售)业务日期-出库日期
+     */
+    private String businessdate;
+    /**
+     * (销售)业务日期-交易日期
+     */
+    private String successfultradedate;
+    /**
+     * (销售)业务发生类型
+     */
+    private String businesstype;
+    /**
+     * 自定义项
+     */
+    private String def1;
+    /**
+     * 自定义项
+     */
+    private String def2;
+    /**
+     * 自定义项
+     */
+    private String def3;
+    /**
+     * 自定义项
+     */
+    private String def4;
+    /**
+     * 自定义项
+     */
+    private String def5;
+    /**
+     * 自定义项
+     */
+    private String def6;
+    /**
+     * 自定义项
+     */
+    private String def7;
+    /**
+     * 自定义项
+     */
+    private String def8;
+    /**
+     * 自定义项
+     */
+    private String def9;
+    /**
+     * 自定义项
+     */
+    private String def10;
+    /**
+     * 自定义项
+     */
+    private String def11;
+    /**
+     * 自定义项
+     */
+    private String def12;
+    /**
+     * 自定义项
+     */
+    private String def13;
+    /**
+     * 自定义项
+     */
+    private String def14;
+    /**
+     * 自定义项
+     */
+    private String def15;
+    /**
+     * 自定义项
+     */
+    private String def16;
+    /**
+     * 自定义项
+     */
+    private String def17;
+    /**
+     * 自定义项
+     */
+    private String def18;
+    /**
+     * 自定义项
+     */
+    private String def19;
+    /**
+     * 自定义项
+     */
+    private String def20;
+    /**
+     * 自定义项
+     */
+    private String def21;
+    /**
+     * 自定义项
+     */
+    private String def22;
+    /**
+     * 自定义项
+     */
+    private String def23;
+    /**
+     * 自定义项
+     */
+    private String def24;
+    /**
+     * 自定义项
+     */
+    private String def25;
+    /**
+     * 自定义项
+     */
+    private String def26;
+    /**
+     * 自定义项
+     */
+    private String def27;
+    /**
+     * 自定义项
+     */
+    private String def28;
+    /**
+     * 自定义项
+     */
+    private String def29;
+    /**
+     * 自定义项
+     */
+    private String def30;
+    /**
+     * 自定义项
+     */
+    private String def31;
+    /**
+     * 自定义项
+     */
+    private String def32;
+    /**
+     * 自定义项
+     */
+    private String def33;
+    /**
+     * 自定义项
+     */
+    private String def34;
+    /**
+     * 自定义项
+     */
+    private String def35;
+    /**
+     * 自定义项
+     */
+    private String def36;
+    /**
+     * 自定义项
+     */
+    private String def37;
+    /**
+     * 自定义项
+     */
+    private String def38;
+    /**
+     * 自定义项
+     */
+    private String def39;
+    /**
+     * 自定义项
+     */
+    private String def40;
 }
-
-    public void setBusinessDate(String businessDate) {
-        this.businessDate = businessDate;
-    }
-
-    public String getBusinessType() {
-        return businessType;
-    }
-
-    public void setBusinessType(String businessType) {
-        this.businessType = businessType;
-    }
-
-    public String getNewTransmitInfo() {
-        return newTransmitInfo;
-    }
-
-    public void setNewTransmitInfo(String newTransmitInfo) {
-        this.newTransmitInfo = newTransmitInfo;
-    }
-
-    public String getNewPushDate() {
-        return newPushDate;
-    }
-
-    public void setNewPushDate(String newPushDate) {
-        this.newPushDate = newPushDate;
-    }
-
-    public String getNewState() {
-        return newState;
-    }
-
-    public void setNewState(String newState) {
-        this.newState = newState;
-    }
-
-    public String getNewSystemNumber() {
-        return newSystemNumber;
-    }
-
-    public void setNewSystemNumber(String newSystemNumber) {
-        this.newSystemNumber = newSystemNumber;
-    }
-
-    public String getNewSystemPrimary() {
-        return newSystemPrimary;
-    }
-
-    public void setNewSystemPrimary(String newSystemPrimary) {
-        this.newSystemPrimary = newSystemPrimary;
-    }
-
-    public String getPrimaryKey() {
-        return primaryKey;
-    }
-
-    public void setPrimaryKey(String primaryKey) {
-        this.primaryKey = primaryKey;
-    }
-
-    public String getClientcode() {
-        return clientcode;
-    }
-
-    public void setClientcode(String clientcode) {
-        this.clientcode = clientcode;
-    }
-
-    public String getCompanycode() {
-        return companycode;
-    }
-
-    public void setCompanycode(String companycode) {
-        this.companycode = companycode;
-    }
-
-    public String getFacilitycode() {
-        return facilitycode;
-    }
-
-    public void setFacilitycode(String facilitycode) {
-        this.facilitycode = facilitycode;
-    }
-
-    public String getShipmentcode() {
-        return shipmentcode;
-    }
-
-    public void setShipmentcode(String shipmentcode) {
-        this.shipmentcode = shipmentcode;
-    }
-
-    public Long getReforderid() {
-        return reforderid;
-    }
-
-    public void setReforderid(Long reforderid) {
-        this.reforderid = reforderid;
-    }
-
-    public Long getReforderdetailid() {
-        return reforderdetailid;
-    }
-
-    public void setReforderdetailid(Long reforderdetailid) {
-        this.reforderdetailid = reforderdetailid;
-    }
-
-    public String getRefordercode() {
-        return refordercode;
-    }
-
-    public void setRefordercode(String refordercode) {
-        this.refordercode = refordercode;
-    }
-
-    public Long getAllocinvid() {
-        return allocinvid;
-    }
-
-    public void setAllocinvid(Long allocinvid) {
-        this.allocinvid = allocinvid;
-    }
-
-    public String getSkucode() {
-        return skucode;
-    }
-
-    public void setSkucode(String skucode) {
-        this.skucode = skucode;
-    }
-
-    public String getSkuname() {
-        return skuname;
-    }
-
-    public void setSkuname(String skuname) {
-        this.skuname = skuname;
-    }
-
-    public String getSourceordercode() {
-        return sourceordercode;
-    }
-
-    public void setSourceordercode(String sourceordercode) {
-        this.sourceordercode = sourceordercode;
-    }
-
-    public String getInventorysts() {
-        return inventorysts;
-    }
-
-    public void setInventorysts(String inventorysts) {
-        this.inventorysts = inventorysts;
-    }
-
-    public Long getIsgift() {
-        return isgift;
-    }
-
-    public void setIsgift(Long isgift) {
-        this.isgift = isgift;
-    }
-
-    public Long getRequestqty() {
-        return requestqty;
-    }
-
-    public void setRequestqty(Long requestqty) {
-        this.requestqty = requestqty;
-    }
-
-    public Long getShipqty() {
-        return shipqty;
-    }
-
-    public void setShipqty(Long shipqty) {
-        this.shipqty = shipqty;
-    }
-
-    public String getQuantityum() {
-        return quantityum;
-    }
-
-    public void setQuantityum(String quantityum) {
-        this.quantityum = quantityum;
-    }
-
-    public Long getListprice() {
-        return listprice;
-    }
-
-    public void setListprice(Long listprice) {
-        this.listprice = listprice;
-    }
-
-    public Long getItemtotalamount() {
-        return itemtotalamount;
-    }
-
-    public void setItemtotalamount(Long itemtotalamount) {
-        this.itemtotalamount = itemtotalamount;
-    }
-
-    public Long getTotalpayamount() {
-        return totalpayamount;
-    }
-
-    public void setTotalpayamount(Long totalpayamount) {
-        this.totalpayamount = totalpayamount;
-    }
-
-    public Long getTotalweight() {
-        return totalweight;
-    }
-
-    public void setTotalweight(Long totalweight) {
-        this.totalweight = totalweight;
-    }
-
-    public Long getTotalvolume() {
-        return totalvolume;
-    }
-
-    public void setTotalvolume(Long totalvolume) {
-        this.totalvolume = totalvolume;
-    }
-
-    public Long getTotalvolumeweight() {
-        return totalvolumeweight;
-    }
-
-    public void setTotalvolumeweight(Long totalvolumeweight) {
-        this.totalvolumeweight = totalvolumeweight;
-    }
-
-    public String getWeightum() {
-        return weightum;
-    }
-
-    public void setWeightum(String weightum) {
-        this.weightum = weightum;
-    }
-
-    public String getVolumeum() {
-        return volumeum;
-    }
-
-    public void setVolumeum(String volumeum) {
-        this.volumeum = volumeum;
-    }
-
-    public String getCreated() {
-        return created;
-    }
-
-    public void setCreated(String created) {
-        this.created = created;
-    }
-
-    public String getCreatedby() {
-        return createdby;
-    }
-
-    public void setCreatedby(String createdby) {
-        this.createdby = createdby;
-    }
-
-    public String getLastupdated() {
-        return lastupdated;
-    }
-
-    public void setLastupdated(String lastupdated) {
-        this.lastupdated = lastupdated;
-    }
-
-    public String getLastupdatedby() {
-        return lastupdatedby;
-    }
-
-    public void setLastupdatedby(String lastupdatedby) {
-        this.lastupdatedby = lastupdatedby;
-    }
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutEntity.java

@@ -1,14 +1,17 @@
 package com.hzya.frame.plugin.lets.ofs.entity;
 
 import com.hzya.frame.web.entity.BaseEntity;
+import lombok.Data;
 
 /**
- * root(TocofsSaleout)实体类
+ * O出库单表头(TOC、TOB业务底表)(TocofsSaleout)实体类
  *
  * @author makejava
- * @since 2024-08-01 17:01:32
+ * @since 2024-09-04 17:48:16
  */
+@Data
 public class TocofsSaleoutEntity extends BaseEntity {
+
     /**
      * LETS
      */
@@ -73,14 +76,14 @@ public class TocofsSaleoutEntity extends BaseEntity {
      * LETS-SO2024031900000002
      */
     private String sourceordercode;
-    /**
-     * TB
-     */
-    private String sourceuseraccount;
     /**
      * 杨
      */
     private String shiptoattentionto;
+    /**
+     * TB
+     */
+    private String sourceuseraccount;
     /**
      * AAA
      */
@@ -157,10 +160,19 @@ public class TocofsSaleoutEntity extends BaseEntity {
      * 640
      */
     private Long itemtotalamount;
+    private String totalfulfillqty;
+    private String totalfulfillweight;
+    private String totalfulfillvolume;
+    private String totalfulfillvolumeweight;
+    /**
+     * 发货日期
+     */
+    private String shipat;
     /**
      * ZTO
      */
     private String carriercode;
+    private String primarywaybillcode;
     /**
      * 1
      */
@@ -212,6 +224,14 @@ public class TocofsSaleoutEntity extends BaseEntity {
      * 1
      */
     private Long taxpaid;
+    /**
+     * 交易成功时间
+     */
+    private String tradesuccessat;
+    /**
+     * 交易成功状态
+     */
+    private String sourceorderstatus;
     /**
      * 上海市
      */
@@ -224,491 +244,168 @@ public class TocofsSaleoutEntity extends BaseEntity {
      * 杨浦区
      */
     private String shiptodistrictname;
-
     /**
-     * 发货时间
+     * 出库类型
      */
-    private String shipAt;
+    private String shipmenttype;
-
+    /**
-    public String getShipAt() {
+     * 自定义项
-        return shipAt;
+     */
+    private String def1;
+    /**
+     * 自定义项
+     */
+    private String def2;
+    /**
+     * 自定义项
+     */
+    private String def3;
+    /**
+     * 自定义项
+     */
+    private String def4;
+    /**
+     * 自定义项
+     */
+    private String def5;
+    /**
+     * 自定义项
+     */
+    private String def6;
+    /**
+     * 自定义项
+     */
+    private String def7;
+    /**
+     * 自定义项
+     */
+    private String def8;
+    /**
+     * 自定义项
+     */
+    private String def9;
+    /**
+     * 自定义项
+     */
+    private String def10;
+    /**
+     * 自定义项
+     */
+    private String def11;
+    /**
+     * 自定义项
+     */
+    private String def12;
+    /**
+     * 自定义项
+     */
+    private String def13;
+    /**
+     * 自定义项
+     */
+    private String def14;
+    /**
+     * 自定义项
+     */
+    private String def15;
+    /**
+     * 自定义项
+     */
+    private String def16;
+    /**
+     * 自定义项
+     */
+    private String def17;
+    /**
+     * 自定义项
+     */
+    private String def18;
+    /**
+     * 自定义项
+     */
+    private String def19;
+    /**
+     * 自定义项
+     */
+    private String def20;
+    /**
+     * 自定义项
+     */
+    private String def21;
+    /**
+     * 自定义项
+     */
+    private String def22;
+    /**
+     * 自定义项
+     */
+    private String def23;
+    /**
+     * 自定义项
+     */
+    private String def24;
+    /**
+     * 自定义项
+     */
+    private String def25;
+    /**
+     * 自定义项
+     */
+    private String def26;
+    /**
+     * 自定义项
+     */
+    private String def27;
+    /**
+     * 自定义项
+     */
+    private String def28;
+    /**
+     * 自定义项
+     */
+    private String def29;
+    /**
+     * 自定义项
+     */
+    private String def30;
+    /**
+     * 自定义项
+     */
+    private String def31;
+    /**
+     * 自定义项
+     */
+    private String def32;
+    /**
+     * 自定义项
+     */
+    private String def33;
+    /**
+     * 自定义项
+     */
+    private String def34;
+    /**
+     * 自定义项
+     */
+    private String def35;
+    /**
+     * 自定义项
+     */
+    private String def36;
+    /**
+     * 自定义项
+     */
+    private String def37;
+    /**
+     * 自定义项
+     */
+    private String def38;
+    /**
+     * 自定义项
+     */
+    private String def39;
+    /**
+     * 自定义项
+     */
+    private String def40;
 }
-
-    public void setShipAt(String shipAt) {
-        this.shipAt = shipAt;
-    }
-
-    public String getClientcode() {
-        return clientcode;
-    }
-
-    public void setClientcode(String clientcode) {
-        this.clientcode = clientcode;
-    }
-
-    public String getCompanycode() {
-        return companycode;
-    }
-
-    public void setCompanycode(String companycode) {
-        this.companycode = companycode;
-    }
-
-    public String getStorecode() {
-        return storecode;
-    }
-
-    public void setStorecode(String storecode) {
-        this.storecode = storecode;
-    }
-
-    public String getFacilitycode() {
-        return facilitycode;
-    }
-
-    public void setFacilitycode(String facilitycode) {
-        this.facilitycode = facilitycode;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public Long getReforderid() {
-        return reforderid;
-    }
-
-    public void setReforderid(Long reforderid) {
-        this.reforderid = reforderid;
-    }
-
-    public String getRefordercode() {
-        return refordercode;
-    }
-
-    public void setRefordercode(String refordercode) {
-        this.refordercode = refordercode;
-    }
-
-    public String getRefordertype() {
-        return refordertype;
-    }
-
-    public void setRefordertype(String refordertype) {
-        this.refordertype = refordertype;
-    }
-
-    public Long getStatus() {
-        return status;
-    }
-
-    public void setStatus(Long status) {
-        this.status = status;
-    }
-
-    public Long getConsolidated() {
-        return consolidated;
-    }
-
-    public void setConsolidated(Long consolidated) {
-        this.consolidated = consolidated;
-    }
-
-    public String getInternalinstructiontype() {
-        return internalinstructiontype;
-    }
-
-    public void setInternalinstructiontype(String internalinstructiontype) {
-        this.internalinstructiontype = internalinstructiontype;
-    }
-
-    public String getBizchannel() {
-        return bizchannel;
-    }
-
-    public void setBizchannel(String bizchannel) {
-        this.bizchannel = bizchannel;
-    }
-
-    public String getSourceplatformcode() {
-        return sourceplatformcode;
-    }
-
-    public void setSourceplatformcode(String sourceplatformcode) {
-        this.sourceplatformcode = sourceplatformcode;
-    }
-
-    public String getProcesstype() {
-        return processtype;
-    }
-
-    public void setProcesstype(String processtype) {
-        this.processtype = processtype;
-    }
-
-    public Long getSourceorderid() {
-        return sourceorderid;
-    }
-
-    public void setSourceorderid(Long sourceorderid) {
-        this.sourceorderid = sourceorderid;
-    }
-
-    public String getSourceordercode() {
-        return sourceordercode;
-    }
-
-    public void setSourceordercode(String sourceordercode) {
-        this.sourceordercode = sourceordercode;
-    }
-
-    public String getSourceuseraccount() {
-        return sourceuseraccount;
-    }
-
-    public void setSourceuseraccount(String sourceuseraccount) {
-        this.sourceuseraccount = sourceuseraccount;
-    }
-
-    public String getShiptoattentionto() {
-        return shiptoattentionto;
-    }
-
-    public void setShiptoattentionto(String shiptoattentionto) {
-        this.shiptoattentionto = shiptoattentionto;
-    }
-
-    public String getShiptoaddress() {
-        return shiptoaddress;
-    }
-
-    public void setShiptoaddress(String shiptoaddress) {
-        this.shiptoaddress = shiptoaddress;
-    }
-
-    public String getShiptocountry() {
-        return shiptocountry;
-    }
-
-    public void setShiptocountry(String shiptocountry) {
-        this.shiptocountry = shiptocountry;
-    }
-
-    public String getShiptostate() {
-        return shiptostate;
-    }
-
-    public void setShiptostate(String shiptostate) {
-        this.shiptostate = shiptostate;
-    }
-
-    public String getShiptocity() {
-        return shiptocity;
-    }
-
-    public void setShiptocity(String shiptocity) {
-        this.shiptocity = shiptocity;
-    }
-
-    public String getShiptodistrict() {
-        return shiptodistrict;
-    }
-
-    public void setShiptodistrict(String shiptodistrict) {
-        this.shiptodistrict = shiptodistrict;
-    }
-
-    public String getShiptomobile() {
-        return shiptomobile;
-    }
-
-    public void setShiptomobile(String shiptomobile) {
-        this.shiptomobile = shiptomobile;
-    }
-
-    public Long getTotallines() {
-        return totallines;
-    }
-
-    public void setTotallines(Long totallines) {
-        this.totallines = totallines;
-    }
-
-    public Long getTotalqty() {
-        return totalqty;
-    }
-
-    public void setTotalqty(Long totalqty) {
-        this.totalqty = totalqty;
-    }
-
-    public Long getTotalcontainers() {
-        return totalcontainers;
-    }
-
-    public void setTotalcontainers(Long totalcontainers) {
-        this.totalcontainers = totalcontainers;
-    }
-
-    public Long getTotalcases() {
-        return totalcases;
-    }
-
-    public void setTotalcases(Long totalcases) {
-        this.totalcases = totalcases;
-    }
-
-    public Long getTotalweight() {
-        return totalweight;
-    }
-
-    public void setTotalweight(Long totalweight) {
-        this.totalweight = totalweight;
-    }
-
-    public Long getTotalvolume() {
-        return totalvolume;
-    }
-
-    public void setTotalvolume(Long totalvolume) {
-        this.totalvolume = totalvolume;
-    }
-
-    public Long getTotalvolumeweight() {
-        return totalvolumeweight;
-    }
-
-    public void setTotalvolumeweight(Long totalvolumeweight) {
-        this.totalvolumeweight = totalvolumeweight;
-    }
-
-    public String getWeightum() {
-        return weightum;
-    }
-
-    public void setWeightum(String weightum) {
-        this.weightum = weightum;
-    }
-
-    public String getVolumeum() {
-        return volumeum;
-    }
-
-    public void setVolumeum(String volumeum) {
-        this.volumeum = volumeum;
-    }
-
-    public Long getTotalamount() {
-        return totalamount;
-    }
-
-    public void setTotalamount(Long totalamount) {
-        this.totalamount = totalamount;
-    }
-
-    public Long getTotalpayamount() {
-        return totalpayamount;
-    }
-
-    public void setTotalpayamount(Long totalpayamount) {
-        this.totalpayamount = totalpayamount;
-    }
-
-    public Long getPostageamount() {
-        return postageamount;
-    }
-
-    public void setPostageamount(Long postageamount) {
-        this.postageamount = postageamount;
-    }
-
-    public Long getItemtotalamount() {
-        return itemtotalamount;
-    }
-
-    public void setItemtotalamount(Long itemtotalamount) {
-        this.itemtotalamount = itemtotalamount;
-    }
-
-    public String getCarriercode() {
-        return carriercode;
-    }
-
-    public void setCarriercode(String carriercode) {
-        this.carriercode = carriercode;
-    }
-
-    public Long getPaymentstatus() {
-        return paymentstatus;
-    }
-
-    public void setPaymentstatus(Long paymentstatus) {
-        this.paymentstatus = paymentstatus;
-    }
-
-    public String getCodrequired() {
-        return codrequired;
-    }
-
-    public void setCodrequired(String codrequired) {
-        this.codrequired = codrequired;
-    }
-
-    public String getInvoicerequired() {
-        return invoicerequired;
-    }
-
-    public void setInvoicerequired(String invoicerequired) {
-        this.invoicerequired = invoicerequired;
-    }
-
-    public String getPaidat() {
-        return paidat;
-    }
-
-    public void setPaidat(String paidat) {
-        this.paidat = paidat;
-    }
-
-    public String getShipfromattentionto() {
-        return shipfromattentionto;
-    }
-
-    public void setShipfromattentionto(String shipfromattentionto) {
-        this.shipfromattentionto = shipfromattentionto;
-    }
-
-    public String getShipfromaddress() {
-        return shipfromaddress;
-    }
-
-    public void setShipfromaddress(String shipfromaddress) {
-        this.shipfromaddress = shipfromaddress;
-    }
-
-    public String getShipfromdistrict() {
-        return shipfromdistrict;
-    }
-
-    public void setShipfromdistrict(String shipfromdistrict) {
-        this.shipfromdistrict = shipfromdistrict;
-    }
-
-    public String getShipfromcity() {
-        return shipfromcity;
-    }
-
-    public void setShipfromcity(String shipfromcity) {
-        this.shipfromcity = shipfromcity;
-    }
-
-    public String getShipfromstate() {
-        return shipfromstate;
-    }
-
-    public void setShipfromstate(String shipfromstate) {
-        this.shipfromstate = shipfromstate;
-    }
-
-    public String getShipfromcountry() {
-        return shipfromcountry;
-    }
-
-    public void setShipfromcountry(String shipfromcountry) {
-        this.shipfromcountry = shipfromcountry;
-    }
-
-    public String getShipfrompostalcode() {
-        return shipfrompostalcode;
-    }
-
-    public void setShipfrompostalcode(String shipfrompostalcode) {
-        this.shipfrompostalcode = shipfrompostalcode;
-    }
-
-    public String getShipfromphone() {
-        return shipfromphone;
-    }
-
-    public void setShipfromphone(String shipfromphone) {
-        this.shipfromphone = shipfromphone;
-    }
-
-    public String getShipfrommobile() {
-        return shipfrommobile;
-    }
-
-    public void setShipfrommobile(String shipfrommobile) {
-        this.shipfrommobile = shipfrommobile;
-    }
-
-    public String getShipfromfax() {
-        return shipfromfax;
-    }
-
-    public void setShipfromfax(String shipfromfax) {
-        this.shipfromfax = shipfromfax;
-    }
-
-    public String getShipfromemail() {
-        return shipfromemail;
-    }
-
-    public void setShipfromemail(String shipfromemail) {
-        this.shipfromemail = shipfromemail;
-    }
-
-    public Long getCodamount() {
-        return codamount;
-    }
-
-    public void setCodamount(Long codamount) {
-        this.codamount = codamount;
-    }
-
-    public Long getTax() {
-        return tax;
-    }
-
-    public void setTax(Long tax) {
-        this.tax = tax;
-    }
-
-    public Long getTaxpaid() {
-        return taxpaid;
-    }
-
-    public void setTaxpaid(Long taxpaid) {
-        this.taxpaid = taxpaid;
-    }
-
-    public String getShiptostatename() {
-        return shiptostatename;
-    }
-
-    public void setShiptostatename(String shiptostatename) {
-        this.shiptostatename = shiptostatename;
-    }
-
-    public String getShiptocityname() {
-        return shiptocityname;
-    }
-
-    public void setShiptocityname(String shiptocityname) {
-        this.shiptocityname = shiptocityname;
-    }
-
-    public String getShiptodistrictname() {
-        return shiptodistrictname;
-    }
-
-    public void setShiptodistrictname(String shiptodistrictname) {
-        this.shiptodistrictname = shiptodistrictname;
-    }
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutEntity.xml

@@ -1,7 +1,6 @@
 <?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.plugin.lets.ofs.dao.impl.TocofsSaleoutDaoImpl">
-
     <resultMap id="get-TocofsSaleoutEntity-result" type="com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity" >
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="clientcode" column="clientCode" jdbcType="VARCHAR"/>
@@ -20,8 +19,8 @@
         <result property="processtype" column="processType" jdbcType="VARCHAR"/>
         <result property="sourceorderid" column="sourceOrderId" jdbcType="INTEGER"/>
         <result property="sourceordercode" column="sourceOrderCode" jdbcType="VARCHAR"/>
-           <result property="sourceuseraccount" column="sourceUserAccount" jdbcType="VARCHAR"/>
         <result property="shiptoattentionto" column="shipToAttentionTo" jdbcType="VARCHAR"/>
+        <result property="sourceuseraccount" column="sourceUserAccount" jdbcType="VARCHAR"/>
         <result property="shiptoaddress" column="shipToAddress" jdbcType="VARCHAR"/>
         <result property="shiptocountry" column="shipToCountry" jdbcType="VARCHAR"/>
         <result property="shiptostate" column="shipToState" jdbcType="VARCHAR"/>
@@ -41,7 +40,13 @@
         <result property="totalpayamount" column="totalPayAmount" jdbcType="INTEGER"/>
         <result property="postageamount" column="postageAmount" jdbcType="INTEGER"/>
         <result property="itemtotalamount" column="itemTotalAmount" jdbcType="INTEGER"/>
+        <result property="totalfulfillqty" column="totalFulfillQty" jdbcType="VARCHAR"/>
+        <result property="totalfulfillweight" column="totalFulfillWeight" jdbcType="VARCHAR"/>
+        <result property="totalfulfillvolume" column="totalFulfillVolume" jdbcType="VARCHAR"/>
+        <result property="totalfulfillvolumeweight" column="totalFulfillVolumeWeight" jdbcType="VARCHAR"/>
+        <result property="shipat" column="shipAt" jdbcType="VARCHAR"/>
         <result property="carriercode" column="carrierCode" jdbcType="VARCHAR"/>
+        <result property="primarywaybillcode" column="primaryWaybillCode" jdbcType="VARCHAR"/>
         <result property="paymentstatus" column="paymentStatus" jdbcType="INTEGER"/>
         <result property="codrequired" column="codRequired" jdbcType="VARCHAR"/>
         <result property="invoicerequired" column="invoiceRequired" jdbcType="VARCHAR"/>
@@ -60,13 +65,53 @@
         <result property="codamount" column="codAmount" jdbcType="INTEGER"/>
         <result property="tax" column="tax" jdbcType="INTEGER"/>
         <result property="taxpaid" column="taxPaid" jdbcType="INTEGER"/>
+        <result property="tradesuccessat" column="tradeSuccessAt" jdbcType="VARCHAR"/>
+        <result property="sourceorderstatus" column="sourceOrderStatus" jdbcType="VARCHAR"/>
         <result property="shiptostatename" column="shipToStateName" jdbcType="VARCHAR"/>
         <result property="shiptocityname" column="shipToCityName" jdbcType="VARCHAR"/>
         <result property="shiptodistrictname" column="shipToDistrictName" jdbcType="VARCHAR"/>
-
+        <result property="shipmenttype" column="shipmentType" jdbcType="VARCHAR"/>
-           <result property="shipAt" column="shipAt" jdbcType="VARCHAR"/>
+        <result property="def1" column="def1" jdbcType="VARCHAR"/>
+        <result property="def2" column="def2" jdbcType="VARCHAR"/>
+        <result property="def3" column="def3" jdbcType="VARCHAR"/>
+        <result property="def4" column="def4" jdbcType="VARCHAR"/>
+        <result property="def5" column="def5" jdbcType="VARCHAR"/>
+        <result property="def6" column="def6" jdbcType="VARCHAR"/>
+        <result property="def7" column="def7" jdbcType="VARCHAR"/>
+        <result property="def8" column="def8" jdbcType="VARCHAR"/>
+        <result property="def9" column="def9" jdbcType="VARCHAR"/>
+        <result property="def10" column="def10" jdbcType="VARCHAR"/>
+        <result property="def11" column="def11" jdbcType="VARCHAR"/>
+        <result property="def12" column="def12" jdbcType="VARCHAR"/>
+        <result property="def13" column="def13" jdbcType="VARCHAR"/>
+        <result property="def14" column="def14" jdbcType="VARCHAR"/>
+        <result property="def15" column="def15" jdbcType="VARCHAR"/>
+        <result property="def16" column="def16" jdbcType="VARCHAR"/>
+        <result property="def17" column="def17" jdbcType="VARCHAR"/>
+        <result property="def18" column="def18" jdbcType="VARCHAR"/>
+        <result property="def19" column="def19" jdbcType="VARCHAR"/>
+        <result property="def20" column="def20" jdbcType="VARCHAR"/>
+        <result property="def21" column="def21" jdbcType="VARCHAR"/>
+        <result property="def22" column="def22" jdbcType="VARCHAR"/>
+        <result property="def23" column="def23" jdbcType="VARCHAR"/>
+        <result property="def24" column="def24" jdbcType="VARCHAR"/>
+        <result property="def25" column="def25" jdbcType="VARCHAR"/>
+        <result property="def26" column="def26" jdbcType="VARCHAR"/>
+        <result property="def27" column="def27" jdbcType="VARCHAR"/>
+        <result property="def28" column="def28" jdbcType="VARCHAR"/>
+        <result property="def29" column="def29" jdbcType="VARCHAR"/>
+        <result property="def30" column="def30" jdbcType="VARCHAR"/>
+        <result property="def31" column="def31" jdbcType="VARCHAR"/>
+        <result property="def32" column="def32" jdbcType="VARCHAR"/>
+        <result property="def33" column="def33" jdbcType="VARCHAR"/>
+        <result property="def34" column="def34" jdbcType="VARCHAR"/>
+        <result property="def35" column="def35" jdbcType="VARCHAR"/>
+        <result property="def36" column="def36" jdbcType="VARCHAR"/>
+        <result property="def37" column="def37" jdbcType="VARCHAR"/>
+        <result property="def38" column="def38" jdbcType="VARCHAR"/>
+        <result property="def39" column="def39" jdbcType="VARCHAR"/>
+        <result property="def40" column="def40" jdbcType="VARCHAR"/>
     </resultMap>
-
     <!-- 查询的字段-->
     <sql id = "TocofsSaleoutEntity_Base_Column_List">
         id
@@ -86,8 +131,8 @@
         ,processType
         ,sourceOrderId
         ,sourceOrderCode
-        ,sourceUserAccount 
         ,shipToAttentionTo
+        ,sourceUserAccount
         ,shipToAddress
         ,shipToCountry
         ,shipToState
@@ -107,7 +152,13 @@
         ,totalPayAmount
         ,postageAmount
         ,itemTotalAmount
+        ,totalFulfillQty
+        ,totalFulfillWeight
+        ,totalFulfillVolume
+        ,totalFulfillVolumeWeight
+        ,shipAt
         ,carrierCode
+        ,primaryWaybillCode
         ,paymentStatus
         ,codRequired
         ,invoiceRequired
@@ -126,12 +177,53 @@
         ,codAmount
         ,tax
         ,taxPaid
+        ,tradeSuccessAt
+        ,sourceOrderStatus
         ,shipToStateName
         ,shipToCityName
         ,shipToDistrictName
-        ,shipAt
+        ,shipmentType
+        ,def1
+        ,def2
+        ,def3
+        ,def4
+        ,def5
+        ,def6
+        ,def7
+        ,def8
+        ,def9
+        ,def10
+        ,def11
+        ,def12
+        ,def13
+        ,def14
+        ,def15
+        ,def16
+        ,def17
+        ,def18
+        ,def19
+        ,def20
+        ,def21
+        ,def22
+        ,def23
+        ,def24
+        ,def25
+        ,def26
+        ,def27
+        ,def28
+        ,def29
+        ,def30
+        ,def31
+        ,def32
+        ,def33
+        ,def34
+        ,def35
+        ,def36
+        ,def37
+        ,def38
+        ,def39
+        ,def40
     </sql>
-
     <!-- 查询 采用==查询 -->
     <select id="entity_list_base" resultMap="get-TocofsSaleoutEntity-result" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity">
         select
@@ -155,8 +247,8 @@
             <if test="processtype != null and processtype != ''"> and processType = #{processtype} </if>
             <if test="sourceorderid != null"> and sourceOrderId = #{sourceorderid} </if>
             <if test="sourceordercode != null and sourceordercode != ''"> and sourceOrderCode = #{sourceordercode} </if>
-            <if test="sourceuseraccount != null and sourceuseraccount != ''"> and sourceUserAccount = #{sourceuseraccount} </if>
             <if test="shiptoattentionto != null and shiptoattentionto != ''"> and shipToAttentionTo = #{shiptoattentionto} </if>
+            <if test="sourceuseraccount != null and sourceuseraccount != ''"> and sourceUserAccount = #{sourceuseraccount} </if>
             <if test="shiptoaddress != null and shiptoaddress != ''"> and shipToAddress = #{shiptoaddress} </if>
             <if test="shiptocountry != null and shiptocountry != ''"> and shipToCountry = #{shiptocountry} </if>
             <if test="shiptostate != null and shiptostate != ''"> and shipToState = #{shiptostate} </if>
@@ -176,7 +268,13 @@
             <if test="totalpayamount != null"> and totalPayAmount = #{totalpayamount} </if>
             <if test="postageamount != null"> and postageAmount = #{postageamount} </if>
             <if test="itemtotalamount != null"> and itemTotalAmount = #{itemtotalamount} </if>
+            <if test="totalfulfillqty != null and totalfulfillqty != ''"> and totalFulfillQty = #{totalfulfillqty} </if>
+            <if test="totalfulfillweight != null and totalfulfillweight != ''"> and totalFulfillWeight = #{totalfulfillweight} </if>
+            <if test="totalfulfillvolume != null and totalfulfillvolume != ''"> and totalFulfillVolume = #{totalfulfillvolume} </if>
+            <if test="totalfulfillvolumeweight != null and totalfulfillvolumeweight != ''"> and totalFulfillVolumeWeight = #{totalfulfillvolumeweight} </if>
+            <if test="shipat != null and shipat != ''"> and shipAt = #{shipat} </if>
             <if test="carriercode != null and carriercode != ''"> and carrierCode = #{carriercode} </if>
+            <if test="primarywaybillcode != null and primarywaybillcode != ''"> and primaryWaybillCode = #{primarywaybillcode} </if>
             <if test="paymentstatus != null"> and paymentStatus = #{paymentstatus} </if>
             <if test="codrequired != null and codrequired != ''"> and codRequired = #{codrequired} </if>
             <if test="invoicerequired != null and invoicerequired != ''"> and invoiceRequired = #{invoicerequired} </if>
@@ -195,14 +293,56 @@
             <if test="codamount != null"> and codAmount = #{codamount} </if>
             <if test="tax != null"> and tax = #{tax} </if>
             <if test="taxpaid != null"> and taxPaid = #{taxpaid} </if>
+            <if test="tradesuccessat != null and tradesuccessat != ''"> and tradeSuccessAt = #{tradesuccessat} </if>
+            <if test="sourceorderstatus != null and sourceorderstatus != ''"> and sourceOrderStatus = #{sourceorderstatus} </if>
             <if test="shiptostatename != null and shiptostatename != ''"> and shipToStateName = #{shiptostatename} </if>
             <if test="shiptocityname != null and shiptocityname != ''"> and shipToCityName = #{shiptocityname} </if>
             <if test="shiptodistrictname != null and shiptodistrictname != ''"> and shipToDistrictName = #{shiptodistrictname} </if>
---             and sts='Y'
+            <if test="shipmenttype != null and shipmenttype != ''"> and shipmentType = #{shipmenttype} </if>
-            <if test="shipAt != null and shipAt != ''"> and shipAt = #{shipAt} </if>
+            <if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
+            <if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
+            <if test="def3 != null and def3 != ''"> and def3 = #{def3} </if>
+            <if test="def4 != null and def4 != ''"> and def4 = #{def4} </if>
+            <if test="def5 != null and def5 != ''"> and def5 = #{def5} </if>
+            <if test="def6 != null and def6 != ''"> and def6 = #{def6} </if>
+            <if test="def7 != null and def7 != ''"> and def7 = #{def7} </if>
+            <if test="def8 != null and def8 != ''"> and def8 = #{def8} </if>
+            <if test="def9 != null and def9 != ''"> and def9 = #{def9} </if>
+            <if test="def10 != null and def10 != ''"> and def10 = #{def10} </if>
+            <if test="def11 != null and def11 != ''"> and def11 = #{def11} </if>
+            <if test="def12 != null and def12 != ''"> and def12 = #{def12} </if>
+            <if test="def13 != null and def13 != ''"> and def13 = #{def13} </if>
+            <if test="def14 != null and def14 != ''"> and def14 = #{def14} </if>
+            <if test="def15 != null and def15 != ''"> and def15 = #{def15} </if>
+            <if test="def16 != null and def16 != ''"> and def16 = #{def16} </if>
+            <if test="def17 != null and def17 != ''"> and def17 = #{def17} </if>
+            <if test="def18 != null and def18 != ''"> and def18 = #{def18} </if>
+            <if test="def19 != null and def19 != ''"> and def19 = #{def19} </if>
+            <if test="def20 != null and def20 != ''"> and def20 = #{def20} </if>
+            <if test="def21 != null and def21 != ''"> and def21 = #{def21} </if>
+            <if test="def22 != null and def22 != ''"> and def22 = #{def22} </if>
+            <if test="def23 != null and def23 != ''"> and def23 = #{def23} </if>
+            <if test="def24 != null and def24 != ''"> and def24 = #{def24} </if>
+            <if test="def25 != null and def25 != ''"> and def25 = #{def25} </if>
+            <if test="def26 != null and def26 != ''"> and def26 = #{def26} </if>
+            <if test="def27 != null and def27 != ''"> and def27 = #{def27} </if>
+            <if test="def28 != null and def28 != ''"> and def28 = #{def28} </if>
+            <if test="def29 != null and def29 != ''"> and def29 = #{def29} </if>
+            <if test="def30 != null and def30 != ''"> and def30 = #{def30} </if>
+            <if test="def31 != null and def31 != ''"> and def31 = #{def31} </if>
+            <if test="def32 != null and def32 != ''"> and def32 = #{def32} </if>
+            <if test="def33 != null and def33 != ''"> and def33 = #{def33} </if>
+            <if test="def34 != null and def34 != ''"> and def34 = #{def34} </if>
+            <if test="def35 != null and def35 != ''"> and def35 = #{def35} </if>
+            <if test="def36 != null and def36 != ''"> and def36 = #{def36} </if>
+            <if test="def37 != null and def37 != ''"> and def37 = #{def37} </if>
+            <if test="def38 != null and def38 != ''"> and def38 = #{def38} </if>
+            <if test="def39 != null and def39 != ''"> and def39 = #{def39} </if>
+            <if test="def40 != null and def40 != ''"> and def40 = #{def40} </if>
+            and sts='Y'
         </trim>
-<!--    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
+        <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-<!--    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
     </select>
 
     <!-- 查询符合条件的数量 -->
@@ -226,8 +366,8 @@
             <if test="processtype != null and processtype != ''"> and processType = #{processtype} </if>
             <if test="sourceorderid != null"> and sourceOrderId = #{sourceorderid} </if>
             <if test="sourceordercode != null and sourceordercode != ''"> and sourceOrderCode = #{sourceordercode} </if>
-            <if test="sourceuseraccount != null and sourceuseraccount != ''"> and sourceUserAccount = #{sourceuseraccount} </if>
             <if test="shiptoattentionto != null and shiptoattentionto != ''"> and shipToAttentionTo = #{shiptoattentionto} </if>
+            <if test="sourceuseraccount != null and sourceuseraccount != ''"> and sourceUserAccount = #{sourceuseraccount} </if>
             <if test="shiptoaddress != null and shiptoaddress != ''"> and shipToAddress = #{shiptoaddress} </if>
             <if test="shiptocountry != null and shiptocountry != ''"> and shipToCountry = #{shiptocountry} </if>
             <if test="shiptostate != null and shiptostate != ''"> and shipToState = #{shiptostate} </if>
@@ -247,7 +387,13 @@
             <if test="totalpayamount != null"> and totalPayAmount = #{totalpayamount} </if>
             <if test="postageamount != null"> and postageAmount = #{postageamount} </if>
             <if test="itemtotalamount != null"> and itemTotalAmount = #{itemtotalamount} </if>
+            <if test="totalfulfillqty != null and totalfulfillqty != ''"> and totalFulfillQty = #{totalfulfillqty} </if>
+            <if test="totalfulfillweight != null and totalfulfillweight != ''"> and totalFulfillWeight = #{totalfulfillweight} </if>
+            <if test="totalfulfillvolume != null and totalfulfillvolume != ''"> and totalFulfillVolume = #{totalfulfillvolume} </if>
+            <if test="totalfulfillvolumeweight != null and totalfulfillvolumeweight != ''"> and totalFulfillVolumeWeight = #{totalfulfillvolumeweight} </if>
+            <if test="shipat != null and shipat != ''"> and shipAt = #{shipat} </if>
             <if test="carriercode != null and carriercode != ''"> and carrierCode = #{carriercode} </if>
+            <if test="primarywaybillcode != null and primarywaybillcode != ''"> and primaryWaybillCode = #{primarywaybillcode} </if>
             <if test="paymentstatus != null"> and paymentStatus = #{paymentstatus} </if>
             <if test="codrequired != null and codrequired != ''"> and codRequired = #{codrequired} </if>
             <if test="invoicerequired != null and invoicerequired != ''"> and invoiceRequired = #{invoicerequired} </if>
@@ -266,14 +412,56 @@
             <if test="codamount != null"> and codAmount = #{codamount} </if>
             <if test="tax != null"> and tax = #{tax} </if>
             <if test="taxpaid != null"> and taxPaid = #{taxpaid} </if>
+            <if test="tradesuccessat != null and tradesuccessat != ''"> and tradeSuccessAt = #{tradesuccessat} </if>
+            <if test="sourceorderstatus != null and sourceorderstatus != ''"> and sourceOrderStatus = #{sourceorderstatus} </if>
             <if test="shiptostatename != null and shiptostatename != ''"> and shipToStateName = #{shiptostatename} </if>
             <if test="shiptocityname != null and shiptocityname != ''"> and shipToCityName = #{shiptocityname} </if>
             <if test="shiptodistrictname != null and shiptodistrictname != ''"> and shipToDistrictName = #{shiptodistrictname} </if>
---             and sts='Y'
+            <if test="shipmenttype != null and shipmenttype != ''"> and shipmentType = #{shipmenttype} </if>
-            <if test="shipAt != null and shipAt != ''"> and shipAt = #{shipAt} </if>
+            <if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
+            <if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
+            <if test="def3 != null and def3 != ''"> and def3 = #{def3} </if>
+            <if test="def4 != null and def4 != ''"> and def4 = #{def4} </if>
+            <if test="def5 != null and def5 != ''"> and def5 = #{def5} </if>
+            <if test="def6 != null and def6 != ''"> and def6 = #{def6} </if>
+            <if test="def7 != null and def7 != ''"> and def7 = #{def7} </if>
+            <if test="def8 != null and def8 != ''"> and def8 = #{def8} </if>
+            <if test="def9 != null and def9 != ''"> and def9 = #{def9} </if>
+            <if test="def10 != null and def10 != ''"> and def10 = #{def10} </if>
+            <if test="def11 != null and def11 != ''"> and def11 = #{def11} </if>
+            <if test="def12 != null and def12 != ''"> and def12 = #{def12} </if>
+            <if test="def13 != null and def13 != ''"> and def13 = #{def13} </if>
+            <if test="def14 != null and def14 != ''"> and def14 = #{def14} </if>
+            <if test="def15 != null and def15 != ''"> and def15 = #{def15} </if>
+            <if test="def16 != null and def16 != ''"> and def16 = #{def16} </if>
+            <if test="def17 != null and def17 != ''"> and def17 = #{def17} </if>
+            <if test="def18 != null and def18 != ''"> and def18 = #{def18} </if>
+            <if test="def19 != null and def19 != ''"> and def19 = #{def19} </if>
+            <if test="def20 != null and def20 != ''"> and def20 = #{def20} </if>
+            <if test="def21 != null and def21 != ''"> and def21 = #{def21} </if>
+            <if test="def22 != null and def22 != ''"> and def22 = #{def22} </if>
+            <if test="def23 != null and def23 != ''"> and def23 = #{def23} </if>
+            <if test="def24 != null and def24 != ''"> and def24 = #{def24} </if>
+            <if test="def25 != null and def25 != ''"> and def25 = #{def25} </if>
+            <if test="def26 != null and def26 != ''"> and def26 = #{def26} </if>
+            <if test="def27 != null and def27 != ''"> and def27 = #{def27} </if>
+            <if test="def28 != null and def28 != ''"> and def28 = #{def28} </if>
+            <if test="def29 != null and def29 != ''"> and def29 = #{def29} </if>
+            <if test="def30 != null and def30 != ''"> and def30 = #{def30} </if>
+            <if test="def31 != null and def31 != ''"> and def31 = #{def31} </if>
+            <if test="def32 != null and def32 != ''"> and def32 = #{def32} </if>
+            <if test="def33 != null and def33 != ''"> and def33 = #{def33} </if>
+            <if test="def34 != null and def34 != ''"> and def34 = #{def34} </if>
+            <if test="def35 != null and def35 != ''"> and def35 = #{def35} </if>
+            <if test="def36 != null and def36 != ''"> and def36 = #{def36} </if>
+            <if test="def37 != null and def37 != ''"> and def37 = #{def37} </if>
+            <if test="def38 != null and def38 != ''"> and def38 = #{def38} </if>
+            <if test="def39 != null and def39 != ''"> and def39 = #{def39} </if>
+            <if test="def40 != null and def40 != ''"> and def40 = #{def40} </if>
+            and sts='Y'
         </trim>
-<!--    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
+        <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-<!--    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>-->
+        <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
@@ -299,8 +487,8 @@
             <if test="processtype != null and processtype != ''"> and processType like concat('%',#{processtype},'%') </if>
             <if test="sourceorderid != null"> and sourceOrderId like concat('%',#{sourceorderid},'%') </if>
             <if test="sourceordercode != null and sourceordercode != ''"> and sourceOrderCode like concat('%',#{sourceordercode},'%') </if>
-            <if test="sourceuseraccount != null and sourceuseraccount != ''"> and sourceUserAccount like concat('%',#{sourceuseraccount},'%') </if>
             <if test="shiptoattentionto != null and shiptoattentionto != ''"> and shipToAttentionTo like concat('%',#{shiptoattentionto},'%') </if>
+            <if test="sourceuseraccount != null and sourceuseraccount != ''"> and sourceUserAccount like concat('%',#{sourceuseraccount},'%') </if>
             <if test="shiptoaddress != null and shiptoaddress != ''"> and shipToAddress like concat('%',#{shiptoaddress},'%') </if>
             <if test="shiptocountry != null and shiptocountry != ''"> and shipToCountry like concat('%',#{shiptocountry},'%') </if>
             <if test="shiptostate != null and shiptostate != ''"> and shipToState like concat('%',#{shiptostate},'%') </if>
@@ -320,7 +508,13 @@
             <if test="totalpayamount != null"> and totalPayAmount like concat('%',#{totalpayamount},'%') </if>
             <if test="postageamount != null"> and postageAmount like concat('%',#{postageamount},'%') </if>
             <if test="itemtotalamount != null"> and itemTotalAmount like concat('%',#{itemtotalamount},'%') </if>
+            <if test="totalfulfillqty != null and totalfulfillqty != ''"> and totalFulfillQty like concat('%',#{totalfulfillqty},'%') </if>
+            <if test="totalfulfillweight != null and totalfulfillweight != ''"> and totalFulfillWeight like concat('%',#{totalfulfillweight},'%') </if>
+            <if test="totalfulfillvolume != null and totalfulfillvolume != ''"> and totalFulfillVolume like concat('%',#{totalfulfillvolume},'%') </if>
+            <if test="totalfulfillvolumeweight != null and totalfulfillvolumeweight != ''"> and totalFulfillVolumeWeight like concat('%',#{totalfulfillvolumeweight},'%') </if>
+            <if test="shipat != null and shipat != ''"> and shipAt like concat('%',#{shipat},'%') </if>
             <if test="carriercode != null and carriercode != ''"> and carrierCode like concat('%',#{carriercode},'%') </if>
+            <if test="primarywaybillcode != null and primarywaybillcode != ''"> and primaryWaybillCode like concat('%',#{primarywaybillcode},'%') </if>
             <if test="paymentstatus != null"> and paymentStatus like concat('%',#{paymentstatus},'%') </if>
             <if test="codrequired != null and codrequired != ''"> and codRequired like concat('%',#{codrequired},'%') </if>
             <if test="invoicerequired != null and invoicerequired != ''"> and invoiceRequired like concat('%',#{invoicerequired},'%') </if>
@@ -339,14 +533,56 @@
             <if test="codamount != null"> and codAmount like concat('%',#{codamount},'%') </if>
             <if test="tax != null"> and tax like concat('%',#{tax},'%') </if>
             <if test="taxpaid != null"> and taxPaid like concat('%',#{taxpaid},'%') </if>
+            <if test="tradesuccessat != null and tradesuccessat != ''"> and tradeSuccessAt like concat('%',#{tradesuccessat},'%') </if>
+            <if test="sourceorderstatus != null and sourceorderstatus != ''"> and sourceOrderStatus like concat('%',#{sourceorderstatus},'%') </if>
             <if test="shiptostatename != null and shiptostatename != ''"> and shipToStateName like concat('%',#{shiptostatename},'%') </if>
             <if test="shiptocityname != null and shiptocityname != ''"> and shipToCityName like concat('%',#{shiptocityname},'%') </if>
             <if test="shiptodistrictname != null and shiptodistrictname != ''"> and shipToDistrictName like concat('%',#{shiptodistrictname},'%') </if>
---             and sts='Y'
+            <if test="shipmenttype != null and shipmenttype != ''"> and shipmentType like concat('%',#{shipmenttype},'%') </if>
-            <if test="shipAt != null and shipAt != ''"> and shipAt like concat('%',#{shipAt},'%') </if>
+            <if test="def1 != null and def1 != ''"> and def1 like concat('%',#{def1},'%') </if>
+            <if test="def2 != null and def2 != ''"> and def2 like concat('%',#{def2},'%') </if>
+            <if test="def3 != null and def3 != ''"> and def3 like concat('%',#{def3},'%') </if>
+            <if test="def4 != null and def4 != ''"> and def4 like concat('%',#{def4},'%') </if>
+            <if test="def5 != null and def5 != ''"> and def5 like concat('%',#{def5},'%') </if>
+            <if test="def6 != null and def6 != ''"> and def6 like concat('%',#{def6},'%') </if>
+            <if test="def7 != null and def7 != ''"> and def7 like concat('%',#{def7},'%') </if>
+            <if test="def8 != null and def8 != ''"> and def8 like concat('%',#{def8},'%') </if>
+            <if test="def9 != null and def9 != ''"> and def9 like concat('%',#{def9},'%') </if>
+            <if test="def10 != null and def10 != ''"> and def10 like concat('%',#{def10},'%') </if>
+            <if test="def11 != null and def11 != ''"> and def11 like concat('%',#{def11},'%') </if>
+            <if test="def12 != null and def12 != ''"> and def12 like concat('%',#{def12},'%') </if>
+            <if test="def13 != null and def13 != ''"> and def13 like concat('%',#{def13},'%') </if>
+            <if test="def14 != null and def14 != ''"> and def14 like concat('%',#{def14},'%') </if>
+            <if test="def15 != null and def15 != ''"> and def15 like concat('%',#{def15},'%') </if>
+            <if test="def16 != null and def16 != ''"> and def16 like concat('%',#{def16},'%') </if>
+            <if test="def17 != null and def17 != ''"> and def17 like concat('%',#{def17},'%') </if>
+            <if test="def18 != null and def18 != ''"> and def18 like concat('%',#{def18},'%') </if>
+            <if test="def19 != null and def19 != ''"> and def19 like concat('%',#{def19},'%') </if>
+            <if test="def20 != null and def20 != ''"> and def20 like concat('%',#{def20},'%') </if>
+            <if test="def21 != null and def21 != ''"> and def21 like concat('%',#{def21},'%') </if>
+            <if test="def22 != null and def22 != ''"> and def22 like concat('%',#{def22},'%') </if>
+            <if test="def23 != null and def23 != ''"> and def23 like concat('%',#{def23},'%') </if>
+            <if test="def24 != null and def24 != ''"> and def24 like concat('%',#{def24},'%') </if>
+            <if test="def25 != null and def25 != ''"> and def25 like concat('%',#{def25},'%') </if>
+            <if test="def26 != null and def26 != ''"> and def26 like concat('%',#{def26},'%') </if>
+            <if test="def27 != null and def27 != ''"> and def27 like concat('%',#{def27},'%') </if>
+            <if test="def28 != null and def28 != ''"> and def28 like concat('%',#{def28},'%') </if>
+            <if test="def29 != null and def29 != ''"> and def29 like concat('%',#{def29},'%') </if>
+            <if test="def30 != null and def30 != ''"> and def30 like concat('%',#{def30},'%') </if>
+            <if test="def31 != null and def31 != ''"> and def31 like concat('%',#{def31},'%') </if>
+            <if test="def32 != null and def32 != ''"> and def32 like concat('%',#{def32},'%') </if>
+            <if test="def33 != null and def33 != ''"> and def33 like concat('%',#{def33},'%') </if>
+            <if test="def34 != null and def34 != ''"> and def34 like concat('%',#{def34},'%') </if>
+            <if test="def35 != null and def35 != ''"> and def35 like concat('%',#{def35},'%') </if>
+            <if test="def36 != null and def36 != ''"> and def36 like concat('%',#{def36},'%') </if>
+            <if test="def37 != null and def37 != ''"> and def37 like concat('%',#{def37},'%') </if>
+            <if test="def38 != null and def38 != ''"> and def38 like concat('%',#{def38},'%') </if>
+            <if test="def39 != null and def39 != ''"> and def39 like concat('%',#{def39},'%') </if>
+            <if test="def40 != null and def40 != ''"> and def40 like concat('%',#{def40},'%') </if>
+            and sts='Y'
         </trim>
-<!--    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
+        <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-<!--    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
     </select>
 
     <!-- 查询列表 字段采用or格式 -->
@@ -372,8 +608,8 @@
             <if test="processtype != null and processtype != ''"> or processType = #{processtype} </if>
             <if test="sourceorderid != null"> or sourceOrderId = #{sourceorderid} </if>
             <if test="sourceordercode != null and sourceordercode != ''"> or sourceOrderCode = #{sourceordercode} </if>
-             <if test="sourceuseraccount != null and sourceuseraccount != ''"> or sourceUserAccount = #{sourceuseraccount} </if>
             <if test="shiptoattentionto != null and shiptoattentionto != ''"> or shipToAttentionTo = #{shiptoattentionto} </if>
+            <if test="sourceuseraccount != null and sourceuseraccount != ''"> or sourceUserAccount = #{sourceuseraccount} </if>
             <if test="shiptoaddress != null and shiptoaddress != ''"> or shipToAddress = #{shiptoaddress} </if>
             <if test="shiptocountry != null and shiptocountry != ''"> or shipToCountry = #{shiptocountry} </if>
             <if test="shiptostate != null and shiptostate != ''"> or shipToState = #{shiptostate} </if>
@@ -393,7 +629,13 @@
             <if test="totalpayamount != null"> or totalPayAmount = #{totalpayamount} </if>
             <if test="postageamount != null"> or postageAmount = #{postageamount} </if>
             <if test="itemtotalamount != null"> or itemTotalAmount = #{itemtotalamount} </if>
+            <if test="totalfulfillqty != null and totalfulfillqty != ''"> or totalFulfillQty = #{totalfulfillqty} </if>
+            <if test="totalfulfillweight != null and totalfulfillweight != ''"> or totalFulfillWeight = #{totalfulfillweight} </if>
+            <if test="totalfulfillvolume != null and totalfulfillvolume != ''"> or totalFulfillVolume = #{totalfulfillvolume} </if>
+            <if test="totalfulfillvolumeweight != null and totalfulfillvolumeweight != ''"> or totalFulfillVolumeWeight = #{totalfulfillvolumeweight} </if>
+            <if test="shipat != null and shipat != ''"> or shipAt = #{shipat} </if>
             <if test="carriercode != null and carriercode != ''"> or carrierCode = #{carriercode} </if>
+            <if test="primarywaybillcode != null and primarywaybillcode != ''"> or primaryWaybillCode = #{primarywaybillcode} </if>
             <if test="paymentstatus != null"> or paymentStatus = #{paymentstatus} </if>
             <if test="codrequired != null and codrequired != ''"> or codRequired = #{codrequired} </if>
             <if test="invoicerequired != null and invoicerequired != ''"> or invoiceRequired = #{invoicerequired} </if>
@@ -412,14 +654,56 @@
             <if test="codamount != null"> or codAmount = #{codamount} </if>
             <if test="tax != null"> or tax = #{tax} </if>
             <if test="taxpaid != null"> or taxPaid = #{taxpaid} </if>
+            <if test="tradesuccessat != null and tradesuccessat != ''"> or tradeSuccessAt = #{tradesuccessat} </if>
+            <if test="sourceorderstatus != null and sourceorderstatus != ''"> or sourceOrderStatus = #{sourceorderstatus} </if>
             <if test="shiptostatename != null and shiptostatename != ''"> or shipToStateName = #{shiptostatename} </if>
             <if test="shiptocityname != null and shiptocityname != ''"> or shipToCityName = #{shiptocityname} </if>
             <if test="shiptodistrictname != null and shiptodistrictname != ''"> or shipToDistrictName = #{shiptodistrictname} </if>
---             and sts='Y'
+            <if test="shipmenttype != null and shipmenttype != ''"> or shipmentType = #{shipmenttype} </if>
-             <if test="shipAt != null and shipAt != ''"> or shipAt = #{shipAt} </if>
+            <if test="def1 != null and def1 != ''"> or def1 = #{def1} </if>
+            <if test="def2 != null and def2 != ''"> or def2 = #{def2} </if>
+            <if test="def3 != null and def3 != ''"> or def3 = #{def3} </if>
+            <if test="def4 != null and def4 != ''"> or def4 = #{def4} </if>
+            <if test="def5 != null and def5 != ''"> or def5 = #{def5} </if>
+            <if test="def6 != null and def6 != ''"> or def6 = #{def6} </if>
+            <if test="def7 != null and def7 != ''"> or def7 = #{def7} </if>
+            <if test="def8 != null and def8 != ''"> or def8 = #{def8} </if>
+            <if test="def9 != null and def9 != ''"> or def9 = #{def9} </if>
+            <if test="def10 != null and def10 != ''"> or def10 = #{def10} </if>
+            <if test="def11 != null and def11 != ''"> or def11 = #{def11} </if>
+            <if test="def12 != null and def12 != ''"> or def12 = #{def12} </if>
+            <if test="def13 != null and def13 != ''"> or def13 = #{def13} </if>
+            <if test="def14 != null and def14 != ''"> or def14 = #{def14} </if>
+            <if test="def15 != null and def15 != ''"> or def15 = #{def15} </if>
+            <if test="def16 != null and def16 != ''"> or def16 = #{def16} </if>
+            <if test="def17 != null and def17 != ''"> or def17 = #{def17} </if>
+            <if test="def18 != null and def18 != ''"> or def18 = #{def18} </if>
+            <if test="def19 != null and def19 != ''"> or def19 = #{def19} </if>
+            <if test="def20 != null and def20 != ''"> or def20 = #{def20} </if>
+            <if test="def21 != null and def21 != ''"> or def21 = #{def21} </if>
+            <if test="def22 != null and def22 != ''"> or def22 = #{def22} </if>
+            <if test="def23 != null and def23 != ''"> or def23 = #{def23} </if>
+            <if test="def24 != null and def24 != ''"> or def24 = #{def24} </if>
+            <if test="def25 != null and def25 != ''"> or def25 = #{def25} </if>
+            <if test="def26 != null and def26 != ''"> or def26 = #{def26} </if>
+            <if test="def27 != null and def27 != ''"> or def27 = #{def27} </if>
+            <if test="def28 != null and def28 != ''"> or def28 = #{def28} </if>
+            <if test="def29 != null and def29 != ''"> or def29 = #{def29} </if>
+            <if test="def30 != null and def30 != ''"> or def30 = #{def30} </if>
+            <if test="def31 != null and def31 != ''"> or def31 = #{def31} </if>
+            <if test="def32 != null and def32 != ''"> or def32 = #{def32} </if>
+            <if test="def33 != null and def33 != ''"> or def33 = #{def33} </if>
+            <if test="def34 != null and def34 != ''"> or def34 = #{def34} </if>
+            <if test="def35 != null and def35 != ''"> or def35 = #{def35} </if>
+            <if test="def36 != null and def36 != ''"> or def36 = #{def36} </if>
+            <if test="def37 != null and def37 != ''"> or def37 = #{def37} </if>
+            <if test="def38 != null and def38 != ''"> or def38 = #{def38} </if>
+            <if test="def39 != null and def39 != ''"> or def39 = #{def39} </if>
+            <if test="def40 != null and def40 != ''"> or def40 = #{def40} </if>
+            and sts='Y'
         </trim>
-<!--    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>-->
+        <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
-<!--    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
+        <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
     </select>
 
     <!--新增所有列-->
@@ -443,8 +727,8 @@
             <if test="processtype != null and processtype != ''"> processType , </if>
             <if test="sourceorderid != null"> sourceOrderId , </if>
             <if test="sourceordercode != null and sourceordercode != ''"> sourceOrderCode , </if>
-            <if test="sourceuseraccount != null and sourceuseraccount != ''"> sourceUserAccount , </if>
             <if test="shiptoattentionto != null and shiptoattentionto != ''"> shipToAttentionTo , </if>
+            <if test="sourceuseraccount != null and sourceuseraccount != ''"> sourceUserAccount , </if>
             <if test="shiptoaddress != null and shiptoaddress != ''"> shipToAddress , </if>
             <if test="shiptocountry != null and shiptocountry != ''"> shipToCountry , </if>
             <if test="shiptostate != null and shiptostate != ''"> shipToState , </if>
@@ -464,7 +748,13 @@
             <if test="totalpayamount != null"> totalPayAmount , </if>
             <if test="postageamount != null"> postageAmount , </if>
             <if test="itemtotalamount != null"> itemTotalAmount , </if>
+            <if test="totalfulfillqty != null and totalfulfillqty != ''"> totalFulfillQty , </if>
+            <if test="totalfulfillweight != null and totalfulfillweight != ''"> totalFulfillWeight , </if>
+            <if test="totalfulfillvolume != null and totalfulfillvolume != ''"> totalFulfillVolume , </if>
+            <if test="totalfulfillvolumeweight != null and totalfulfillvolumeweight != ''"> totalFulfillVolumeWeight , </if>
+            <if test="shipat != null and shipat != ''"> shipAt , </if>
             <if test="carriercode != null and carriercode != ''"> carrierCode , </if>
+            <if test="primarywaybillcode != null and primarywaybillcode != ''"> primaryWaybillCode , </if>
             <if test="paymentstatus != null"> paymentStatus , </if>
             <if test="codrequired != null and codrequired != ''"> codRequired , </if>
             <if test="invoicerequired != null and invoicerequired != ''"> invoiceRequired , </if>
@@ -483,9 +773,52 @@
             <if test="codamount != null"> codAmount , </if>
             <if test="tax != null"> tax , </if>
             <if test="taxpaid != null"> taxPaid , </if>
+            <if test="tradesuccessat != null and tradesuccessat != ''"> tradeSuccessAt , </if>
+            <if test="sourceorderstatus != null and sourceorderstatus != ''"> sourceOrderStatus , </if>
             <if test="shiptostatename != null and shiptostatename != ''"> shipToStateName , </if>
             <if test="shiptocityname != null and shiptocityname != ''"> shipToCityName , </if>
             <if test="shiptodistrictname != null and shiptodistrictname != ''"> shipToDistrictName , </if>
+            <if test="shipmenttype != null and shipmenttype != ''"> shipmentType , </if>
+            <if test="def1 != null and def1 != ''"> def1 , </if>
+            <if test="def2 != null and def2 != ''"> def2 , </if>
+            <if test="def3 != null and def3 != ''"> def3 , </if>
+            <if test="def4 != null and def4 != ''"> def4 , </if>
+            <if test="def5 != null and def5 != ''"> def5 , </if>
+            <if test="def6 != null and def6 != ''"> def6 , </if>
+            <if test="def7 != null and def7 != ''"> def7 , </if>
+            <if test="def8 != null and def8 != ''"> def8 , </if>
+            <if test="def9 != null and def9 != ''"> def9 , </if>
+            <if test="def10 != null and def10 != ''"> def10 , </if>
+            <if test="def11 != null and def11 != ''"> def11 , </if>
+            <if test="def12 != null and def12 != ''"> def12 , </if>
+            <if test="def13 != null and def13 != ''"> def13 , </if>
+            <if test="def14 != null and def14 != ''"> def14 , </if>
+            <if test="def15 != null and def15 != ''"> def15 , </if>
+            <if test="def16 != null and def16 != ''"> def16 , </if>
+            <if test="def17 != null and def17 != ''"> def17 , </if>
+            <if test="def18 != null and def18 != ''"> def18 , </if>
+            <if test="def19 != null and def19 != ''"> def19 , </if>
+            <if test="def20 != null and def20 != ''"> def20 , </if>
+            <if test="def21 != null and def21 != ''"> def21 , </if>
+            <if test="def22 != null and def22 != ''"> def22 , </if>
+            <if test="def23 != null and def23 != ''"> def23 , </if>
+            <if test="def24 != null and def24 != ''"> def24 , </if>
+            <if test="def25 != null and def25 != ''"> def25 , </if>
+            <if test="def26 != null and def26 != ''"> def26 , </if>
+            <if test="def27 != null and def27 != ''"> def27 , </if>
+            <if test="def28 != null and def28 != ''"> def28 , </if>
+            <if test="def29 != null and def29 != ''"> def29 , </if>
+            <if test="def30 != null and def30 != ''"> def30 , </if>
+            <if test="def31 != null and def31 != ''"> def31 , </if>
+            <if test="def32 != null and def32 != ''"> def32 , </if>
+            <if test="def33 != null and def33 != ''"> def33 , </if>
+            <if test="def34 != null and def34 != ''"> def34 , </if>
+            <if test="def35 != null and def35 != ''"> def35 , </if>
+            <if test="def36 != null and def36 != ''"> def36 , </if>
+            <if test="def37 != null and def37 != ''"> def37 , </if>
+            <if test="def38 != null and def38 != ''"> def38 , </if>
+            <if test="def39 != null and def39 != ''"> def39 , </if>
+            <if test="def40 != null and def40 != ''"> def40 , </if>
             <if test="sorts == null ">sorts,</if>
             <if test="sts == null ">sts,</if>
         </trim>
@@ -508,8 +841,8 @@
             <if test="processtype != null and processtype != ''"> #{processtype} ,</if>
             <if test="sourceorderid != null"> #{sourceorderid} ,</if>
             <if test="sourceordercode != null and sourceordercode != ''"> #{sourceordercode} ,</if>
-            <if test="sourceuseraccount != null and sourceuseraccount != ''"> #{sourceuseraccount} ,</if>
             <if test="shiptoattentionto != null and shiptoattentionto != ''"> #{shiptoattentionto} ,</if>
+            <if test="sourceuseraccount != null and sourceuseraccount != ''"> #{sourceuseraccount} ,</if>
             <if test="shiptoaddress != null and shiptoaddress != ''"> #{shiptoaddress} ,</if>
             <if test="shiptocountry != null and shiptocountry != ''"> #{shiptocountry} ,</if>
             <if test="shiptostate != null and shiptostate != ''"> #{shiptostate} ,</if>
@@ -529,7 +862,13 @@
             <if test="totalpayamount != null"> #{totalpayamount} ,</if>
             <if test="postageamount != null"> #{postageamount} ,</if>
             <if test="itemtotalamount != null"> #{itemtotalamount} ,</if>
+            <if test="totalfulfillqty != null and totalfulfillqty != ''"> #{totalfulfillqty} ,</if>
+            <if test="totalfulfillweight != null and totalfulfillweight != ''"> #{totalfulfillweight} ,</if>
+            <if test="totalfulfillvolume != null and totalfulfillvolume != ''"> #{totalfulfillvolume} ,</if>
+            <if test="totalfulfillvolumeweight != null and totalfulfillvolumeweight != ''"> #{totalfulfillvolumeweight} ,</if>
+            <if test="shipat != null and shipat != ''"> #{shipat} ,</if>
             <if test="carriercode != null and carriercode != ''"> #{carriercode} ,</if>
+            <if test="primarywaybillcode != null and primarywaybillcode != ''"> #{primarywaybillcode} ,</if>
             <if test="paymentstatus != null"> #{paymentstatus} ,</if>
             <if test="codrequired != null and codrequired != ''"> #{codrequired} ,</if>
             <if test="invoicerequired != null and invoicerequired != ''"> #{invoicerequired} ,</if>
@@ -548,41 +887,74 @@
             <if test="codamount != null"> #{codamount} ,</if>
             <if test="tax != null"> #{tax} ,</if>
             <if test="taxpaid != null"> #{taxpaid} ,</if>
+            <if test="tradesuccessat != null and tradesuccessat != ''"> #{tradesuccessat} ,</if>
+            <if test="sourceorderstatus != null and sourceorderstatus != ''"> #{sourceorderstatus} ,</if>
             <if test="shiptostatename != null and shiptostatename != ''"> #{shiptostatename} ,</if>
             <if test="shiptocityname != null and shiptocityname != ''"> #{shiptocityname} ,</if>
             <if test="shiptodistrictname != null and shiptodistrictname != ''"> #{shiptodistrictname} ,</if>
+            <if test="shipmenttype != null and shipmenttype != ''"> #{shipmenttype} ,</if>
+            <if test="def1 != null and def1 != ''"> #{def1} ,</if>
+            <if test="def2 != null and def2 != ''"> #{def2} ,</if>
+            <if test="def3 != null and def3 != ''"> #{def3} ,</if>
+            <if test="def4 != null and def4 != ''"> #{def4} ,</if>
+            <if test="def5 != null and def5 != ''"> #{def5} ,</if>
+            <if test="def6 != null and def6 != ''"> #{def6} ,</if>
+            <if test="def7 != null and def7 != ''"> #{def7} ,</if>
+            <if test="def8 != null and def8 != ''"> #{def8} ,</if>
+            <if test="def9 != null and def9 != ''"> #{def9} ,</if>
+            <if test="def10 != null and def10 != ''"> #{def10} ,</if>
+            <if test="def11 != null and def11 != ''"> #{def11} ,</if>
+            <if test="def12 != null and def12 != ''"> #{def12} ,</if>
+            <if test="def13 != null and def13 != ''"> #{def13} ,</if>
+            <if test="def14 != null and def14 != ''"> #{def14} ,</if>
+            <if test="def15 != null and def15 != ''"> #{def15} ,</if>
+            <if test="def16 != null and def16 != ''"> #{def16} ,</if>
+            <if test="def17 != null and def17 != ''"> #{def17} ,</if>
+            <if test="def18 != null and def18 != ''"> #{def18} ,</if>
+            <if test="def19 != null and def19 != ''"> #{def19} ,</if>
+            <if test="def20 != null and def20 != ''"> #{def20} ,</if>
+            <if test="def21 != null and def21 != ''"> #{def21} ,</if>
+            <if test="def22 != null and def22 != ''"> #{def22} ,</if>
+            <if test="def23 != null and def23 != ''"> #{def23} ,</if>
+            <if test="def24 != null and def24 != ''"> #{def24} ,</if>
+            <if test="def25 != null and def25 != ''"> #{def25} ,</if>
+            <if test="def26 != null and def26 != ''"> #{def26} ,</if>
+            <if test="def27 != null and def27 != ''"> #{def27} ,</if>
+            <if test="def28 != null and def28 != ''"> #{def28} ,</if>
+            <if test="def29 != null and def29 != ''"> #{def29} ,</if>
+            <if test="def30 != null and def30 != ''"> #{def30} ,</if>
+            <if test="def31 != null and def31 != ''"> #{def31} ,</if>
+            <if test="def32 != null and def32 != ''"> #{def32} ,</if>
+            <if test="def33 != null and def33 != ''"> #{def33} ,</if>
+            <if test="def34 != null and def34 != ''"> #{def34} ,</if>
+            <if test="def35 != null and def35 != ''"> #{def35} ,</if>
+            <if test="def36 != null and def36 != ''"> #{def36} ,</if>
+            <if test="def37 != null and def37 != ''"> #{def37} ,</if>
+            <if test="def38 != null and def38 != ''"> #{def38} ,</if>
+            <if test="def39 != null and def39 != ''"> #{def39} ,</if>
+            <if test="def40 != null and def40 != ''"> #{def40} ,</if>
             <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from tocofs_saleout a WHERE a.sts = 'Y' ),</if>
             <if test="sts == null ">'Y',</if>
         </trim>
         )
     </insert>
-
     <!-- 批量新增 -->
     <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-  insert into tocofs_saleout(clientCode, companyCode, storeCode, facilityCode, code, refOrderId, refOrderCode, refOrderType, status, consolidated, internalInstructionType, bizChannel, sourcePlatformCode, processType, sourceOrderId, sourceOrderCode, sourceUserAccount, shipToAttentionTo, shipToAddress, shipToCountry, shipToState, shipToCity, shipToDistrict, shipToMobile, totalLines, totalQty, totalContainers, totalCases, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, totalAmount, totalPayAmount, postageAmount, itemTotalAmount, carrierCode, paymentStatus, codRequired, invoiceRequired, paidAt, shipFromAttentionTo, shipFromAddress, shipFromDistrict, shipFromCity, shipFromState, shipFromCountry, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, codAmount, tax, taxPaid, shipToStateName, shipToCityName, shipToDistrictName,  sts) 
+        insert into tocofs_saleout(clientCode, companyCode, storeCode, facilityCode, code, refOrderId, refOrderCode, refOrderType, status, consolidated, internalInstructionType, bizChannel, sourcePlatformCode, processType, sourceOrderId, sourceOrderCode, shipToAttentionTo, sourceUserAccount, shipToAddress, shipToCountry, shipToState, shipToCity, shipToDistrict, shipToMobile, totalLines, totalQty, totalContainers, totalCases, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, totalAmount, totalPayAmount, postageAmount, itemTotalAmount, totalFulfillQty, totalFulfillWeight, totalFulfillVolume, totalFulfillVolumeWeight, shipAt, carrierCode, primaryWaybillCode, paymentStatus, codRequired, invoiceRequired, paidAt, shipFromAttentionTo, shipFromAddress, shipFromDistrict, shipFromCity, shipFromState, shipFromCountry, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, codAmount, tax, taxPaid, tradeSuccessAt, sourceOrderStatus, shipToStateName, shipToCityName, shipToDistrictName, shipmentType, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, def11, def12, def13, def14, def15, def16, def17, def18, def19, def20, def21, def22, def23, def24, def25, def26, def27, def28, def29, def30, def31, def32, def33, def34, def35, def36, def37, def38, def39, def40,  sts)
         values
         <foreach collection="entities" item="entity" separator=",">
-    (#{entity.clientcode},#{entity.companycode},#{entity.storecode},#{entity.facilitycode},#{entity.code},#{entity.reforderid},#{entity.refordercode},#{entity.refordertype},#{entity.status},#{entity.consolidated},#{entity.internalinstructiontype},#{entity.bizchannel},#{entity.sourceplatformcode},#{entity.processtype},#{entity.sourceorderid},#{entity.sourceordercode},#{entity.sourceuseraccount},#{entity.shiptoattentionto},#{entity.shiptoaddress},#{entity.shiptocountry},#{entity.shiptostate},#{entity.shiptocity},#{entity.shiptodistrict},#{entity.shiptomobile},#{entity.totallines},#{entity.totalqty},#{entity.totalcontainers},#{entity.totalcases},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.totalpayamount},#{entity.postageamount},#{entity.itemtotalamount},#{entity.carriercode},#{entity.paymentstatus},#{entity.codrequired},#{entity.invoicerequired},#{entity.paidat},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromdistrict},#{entity.shipfromcity},#{entity.shipfromstate},#{entity.shipfromcountry},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.codamount},#{entity.tax},#{entity.taxpaid},#{entity.shiptostatename},#{entity.shiptocityname},#{entity.shiptodistrictname}, 'Y')
+            (#{entity.clientcode},#{entity.companycode},#{entity.storecode},#{entity.facilitycode},#{entity.code},#{entity.reforderid},#{entity.refordercode},#{entity.refordertype},#{entity.status},#{entity.consolidated},#{entity.internalinstructiontype},#{entity.bizchannel},#{entity.sourceplatformcode},#{entity.processtype},#{entity.sourceorderid},#{entity.sourceordercode},#{entity.shiptoattentionto},#{entity.sourceuseraccount},#{entity.shiptoaddress},#{entity.shiptocountry},#{entity.shiptostate},#{entity.shiptocity},#{entity.shiptodistrict},#{entity.shiptomobile},#{entity.totallines},#{entity.totalqty},#{entity.totalcontainers},#{entity.totalcases},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.totalpayamount},#{entity.postageamount},#{entity.itemtotalamount},#{entity.totalfulfillqty},#{entity.totalfulfillweight},#{entity.totalfulfillvolume},#{entity.totalfulfillvolumeweight},#{entity.shipat},#{entity.carriercode},#{entity.primarywaybillcode},#{entity.paymentstatus},#{entity.codrequired},#{entity.invoicerequired},#{entity.paidat},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromdistrict},#{entity.shipfromcity},#{entity.shipfromstate},#{entity.shipfromcountry},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.codamount},#{entity.tax},#{entity.taxpaid},#{entity.tradesuccessat},#{entity.sourceorderstatus},#{entity.shiptostatename},#{entity.shiptocityname},#{entity.shiptodistrictname},#{entity.shipmenttype},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.def11},#{entity.def12},#{entity.def13},#{entity.def14},#{entity.def15},#{entity.def16},#{entity.def17},#{entity.def18},#{entity.def19},#{entity.def20},#{entity.def21},#{entity.def22},#{entity.def23},#{entity.def24},#{entity.def25},#{entity.def26},#{entity.def27},#{entity.def28},#{entity.def29},#{entity.def30},#{entity.def31},#{entity.def32},#{entity.def33},#{entity.def34},#{entity.def35},#{entity.def36},#{entity.def37},#{entity.def38},#{entity.def39},#{entity.def40}, 'Y')
         </foreach>
     </insert>
-
-<!-- 批量新增v2 -->
-<insert id="entityInsertBatchV2" keyProperty="id" useGeneratedKeys="true">
-    insert IGNORE into tocofs_saleout(id,clientCode, companyCode, storeCode, facilityCode, code, refOrderId, refOrderCode, refOrderType, status, consolidated, internalInstructionType, bizChannel, sourcePlatformCode, processType, sourceOrderId, sourceOrderCode, sourceUserAccount, shipToAttentionTo, shipToAddress, shipToCountry, shipToState, shipToCity, shipToDistrict, shipToMobile, totalLines, totalQty, totalContainers, totalCases, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, totalAmount, totalPayAmount, postageAmount, itemTotalAmount, carrierCode, paymentStatus, codRequired, invoiceRequired, paidAt, shipFromAttentionTo, shipFromAddress, shipFromDistrict, shipFromCity, shipFromState, shipFromCountry, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, codAmount, tax, taxPaid, shipToStateName, shipToCityName, shipToDistrictName,shipAt)
-    values
-    <foreach collection="list" item="entity" separator=",">
-        (#{entity.id},#{entity.clientcode},#{entity.companycode},#{entity.storecode},#{entity.facilitycode},#{entity.code},#{entity.reforderid},#{entity.refordercode},#{entity.refordertype},#{entity.status},#{entity.consolidated},#{entity.internalinstructiontype},#{entity.bizchannel},#{entity.sourceplatformcode},#{entity.processtype},#{entity.sourceorderid},#{entity.sourceordercode},#{entity.sourceuseraccount},#{entity.shiptoattentionto},#{entity.shiptoaddress},#{entity.shiptocountry},#{entity.shiptostate},#{entity.shiptocity},#{entity.shiptodistrict},#{entity.shiptomobile},#{entity.totallines},#{entity.totalqty},#{entity.totalcontainers},#{entity.totalcases},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.totalpayamount},#{entity.postageamount},#{entity.itemtotalamount},#{entity.carriercode},#{entity.paymentstatus},#{entity.codrequired},#{entity.invoicerequired},#{entity.paidat},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromdistrict},#{entity.shipfromcity},#{entity.shipfromstate},#{entity.shipfromcountry},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.codamount},#{entity.tax},#{entity.taxpaid},#{entity.shiptostatename},#{entity.shiptocityname},#{entity.shiptodistrictname},#{entity.shipAt})
-    </foreach>
-</insert>
-
     <!-- 批量新增或者修改-->
     <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-    insert into tocofs_saleout(clientCode, companyCode, storeCode, facilityCode, code, refOrderId, refOrderCode, refOrderType, status, consolidated, internalInstructionType, bizChannel, sourcePlatformCode, processType, sourceOrderId, sourceOrderCode, sourceUserAccount, shipToAttentionTo, shipToAddress, shipToCountry, shipToState, shipToCity, shipToDistrict, shipToMobile, totalLines, totalQty, totalContainers, totalCases, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, totalAmount, totalPayAmount, postageAmount, itemTotalAmount, carrierCode, paymentStatus, codRequired, invoiceRequired, paidAt, shipFromAttentionTo, shipFromAddress, shipFromDistrict, shipFromCity, shipFromState, shipFromCountry, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, codAmount, tax, taxPaid, shipToStateName, shipToCityName, shipToDistrictName,shipAt)
+        insert into tocofs_saleout(id,clientCode, companyCode, storeCode, facilityCode, code, refOrderId, refOrderCode, refOrderType, status, consolidated, internalInstructionType, bizChannel, sourcePlatformCode, processType, sourceOrderId, sourceOrderCode, shipToAttentionTo, sourceUserAccount, shipToAddress, shipToCountry, shipToState, shipToCity, shipToDistrict, shipToMobile, totalLines, totalQty, totalContainers, totalCases, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, totalAmount, totalPayAmount, postageAmount, itemTotalAmount, totalFulfillQty, totalFulfillWeight, totalFulfillVolume, totalFulfillVolumeWeight, shipAt, carrierCode, primaryWaybillCode, paymentStatus, codRequired, invoiceRequired, paidAt, shipFromAttentionTo, shipFromAddress, shipFromDistrict, shipFromCity, shipFromState, shipFromCountry, shipFromPostalCode, shipFromPhone, shipFromMobile, shipFromFax, shipFromEmail, codAmount, tax, taxPaid, tradeSuccessAt, sourceOrderStatus, shipToStateName, shipToCityName, shipToDistrictName, shipmentType, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, def11, def12, def13, def14, def15, def16, def17, def18, def19, def20, def21, def22, def23, def24, def25, def26, def27, def28, def29, def30, def31, def32, def33, def34, def35, def36, def37, def38, def39, def40)
         values
-    <foreach collection="entities" item="entity" separator=",">
+        <foreach collection="list" item="entity" separator=",">
-    (#{entity.clientcode},#{entity.companycode},#{entity.storecode},#{entity.facilitycode},#{entity.code},#{entity.reforderid},#{entity.refordercode},#{entity.refordertype},#{entity.status},#{entity.consolidated},#{entity.internalinstructiontype},#{entity.bizchannel},#{entity.sourceplatformcode},#{entity.processtype},#{entity.sourceorderid},#{entity.sourceordercode},#{entity.sourceuseraccount},#{entity.shiptoattentionto},#{entity.shiptoaddress},#{entity.shiptocountry},#{entity.shiptostate},#{entity.shiptocity},#{entity.shiptodistrict},#{entity.shiptomobile},#{entity.totallines},#{entity.totalqty},#{entity.totalcontainers},#{entity.totalcases},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.totalpayamount},#{entity.postageamount},#{entity.itemtotalamount},#{entity.carriercode},#{entity.paymentstatus},#{entity.codrequired},#{entity.invoicerequired},#{entity.paidat},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromdistrict},#{entity.shipfromcity},#{entity.shipfromstate},#{entity.shipfromcountry},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.codamount},#{entity.tax},#{entity.taxpaid},#{entity.shiptostatename},#{entity.shiptocityname},#{entity.shiptodistrictname},#{entity.shipAt})
+            (#{entity.id},#{entity.clientcode},#{entity.companycode},#{entity.storecode},#{entity.facilitycode},#{entity.code},#{entity.reforderid},#{entity.refordercode},#{entity.refordertype},#{entity.status},#{entity.consolidated},#{entity.internalinstructiontype},#{entity.bizchannel},#{entity.sourceplatformcode},#{entity.processtype},#{entity.sourceorderid},#{entity.sourceordercode},#{entity.shiptoattentionto},#{entity.sourceuseraccount},#{entity.shiptoaddress},#{entity.shiptocountry},#{entity.shiptostate},#{entity.shiptocity},#{entity.shiptodistrict},#{entity.shiptomobile},#{entity.totallines},#{entity.totalqty},#{entity.totalcontainers},#{entity.totalcases},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.totalamount},#{entity.totalpayamount},#{entity.postageamount},#{entity.itemtotalamount},#{entity.totalfulfillqty},#{entity.totalfulfillweight},#{entity.totalfulfillvolume},#{entity.totalfulfillvolumeweight},#{entity.shipat},#{entity.carriercode},#{entity.primarywaybillcode},#{entity.paymentstatus},#{entity.codrequired},#{entity.invoicerequired},#{entity.paidat},#{entity.shipfromattentionto},#{entity.shipfromaddress},#{entity.shipfromdistrict},#{entity.shipfromcity},#{entity.shipfromstate},#{entity.shipfromcountry},#{entity.shipfrompostalcode},#{entity.shipfromphone},#{entity.shipfrommobile},#{entity.shipfromfax},#{entity.shipfromemail},#{entity.codamount},#{entity.tax},#{entity.taxpaid},#{entity.tradesuccessat},#{entity.sourceorderstatus},#{entity.shiptostatename},#{entity.shiptocityname},#{entity.shiptodistrictname},#{entity.shipmenttype},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.def11},#{entity.def12},#{entity.def13},#{entity.def14},#{entity.def15},#{entity.def16},#{entity.def17},#{entity.def18},#{entity.def19},#{entity.def20},#{entity.def21},#{entity.def22},#{entity.def23},#{entity.def24},#{entity.def25},#{entity.def26},#{entity.def27},#{entity.def28},#{entity.def29},#{entity.def30},#{entity.def31},#{entity.def32},#{entity.def33},#{entity.def34},#{entity.def35},#{entity.def36},#{entity.def37},#{entity.def38},#{entity.def39},#{entity.def40})
         </foreach>
         on duplicate key update
+        id = values(id),
         clientCode = values(clientCode),
         companyCode = values(companyCode),
         storeCode = values(storeCode),
@@ -599,8 +971,8 @@
         processType = values(processType),
         sourceOrderId = values(sourceOrderId),
         sourceOrderCode = values(sourceOrderCode),
-    sourceUserAccount = values(sourceUserAccount),
         shipToAttentionTo = values(shipToAttentionTo),
+        sourceUserAccount = values(sourceUserAccount),
         shipToAddress = values(shipToAddress),
         shipToCountry = values(shipToCountry),
         shipToState = values(shipToState),
@@ -620,7 +992,13 @@
         totalPayAmount = values(totalPayAmount),
         postageAmount = values(postageAmount),
         itemTotalAmount = values(itemTotalAmount),
+        totalFulfillQty = values(totalFulfillQty),
+        totalFulfillWeight = values(totalFulfillWeight),
+        totalFulfillVolume = values(totalFulfillVolume),
+        totalFulfillVolumeWeight = values(totalFulfillVolumeWeight),
+        shipAt = values(shipAt),
         carrierCode = values(carrierCode),
+        primaryWaybillCode = values(primaryWaybillCode),
         paymentStatus = values(paymentStatus),
         codRequired = values(codRequired),
         invoiceRequired = values(invoiceRequired),
@@ -639,12 +1017,52 @@
         codAmount = values(codAmount),
         tax = values(tax),
         taxPaid = values(taxPaid),
+        tradeSuccessAt = values(tradeSuccessAt),
+        sourceOrderStatus = values(sourceOrderStatus),
         shipToStateName = values(shipToStateName),
         shipToCityName = values(shipToCityName),
         shipToDistrictName = values(shipToDistrictName),
-    shipAt = values(shipAt)
+        shipmentType = values(shipmentType),
-</insert>
+        def1 = values(def1),
-
+        def2 = values(def2),
+        def3 = values(def3),
+        def4 = values(def4),
+        def5 = values(def5),
+        def6 = values(def6),
+        def7 = values(def7),
+        def8 = values(def8),
+        def9 = values(def9),
+        def10 = values(def10),
+        def11 = values(def11),
+        def12 = values(def12),
+        def13 = values(def13),
+        def14 = values(def14),
+        def15 = values(def15),
+        def16 = values(def16),
+        def17 = values(def17),
+        def18 = values(def18),
+        def19 = values(def19),
+        def20 = values(def20),
+        def21 = values(def21),
+        def22 = values(def22),
+        def23 = values(def23),
+        def24 = values(def24),
+        def25 = values(def25),
+        def26 = values(def26),
+        def27 = values(def27),
+        def28 = values(def28),
+        def29 = values(def29),
+        def30 = values(def30),
+        def31 = values(def31),
+        def32 = values(def32),
+        def33 = values(def33),
+        def34 = values(def34),
+        def35 = values(def35),
+        def36 = values(def36),
+        def37 = values(def37),
+        def38 = values(def38),
+        def39 = values(def39),
+        def40 = values(def40)</insert>
     <!--通过主键修改方法-->
     <update id="entity_update" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity" >
         update tocofs_saleout  set
@@ -665,8 +1083,8 @@ update tocofs_saleout  set
             <if test="processtype != null and processtype != ''"> processType = #{processtype},</if>
             <if test="sourceorderid != null"> sourceOrderId = #{sourceorderid},</if>
             <if test="sourceordercode != null and sourceordercode != ''"> sourceOrderCode = #{sourceordercode},</if>
-  <if test="sourceuseraccount != null and sourceuseraccount != ''"> sourceUserAccount = #{sourceuseraccount},</if>
             <if test="shiptoattentionto != null and shiptoattentionto != ''"> shipToAttentionTo = #{shiptoattentionto},</if>
+            <if test="sourceuseraccount != null and sourceuseraccount != ''"> sourceUserAccount = #{sourceuseraccount},</if>
             <if test="shiptoaddress != null and shiptoaddress != ''"> shipToAddress = #{shiptoaddress},</if>
             <if test="shiptocountry != null and shiptocountry != ''"> shipToCountry = #{shiptocountry},</if>
             <if test="shiptostate != null and shiptostate != ''"> shipToState = #{shiptostate},</if>
@@ -686,7 +1104,13 @@ update tocofs_saleout  set
             <if test="totalpayamount != null"> totalPayAmount = #{totalpayamount},</if>
             <if test="postageamount != null"> postageAmount = #{postageamount},</if>
             <if test="itemtotalamount != null"> itemTotalAmount = #{itemtotalamount},</if>
+            <if test="totalfulfillqty != null and totalfulfillqty != ''"> totalFulfillQty = #{totalfulfillqty},</if>
+            <if test="totalfulfillweight != null and totalfulfillweight != ''"> totalFulfillWeight = #{totalfulfillweight},</if>
+            <if test="totalfulfillvolume != null and totalfulfillvolume != ''"> totalFulfillVolume = #{totalfulfillvolume},</if>
+            <if test="totalfulfillvolumeweight != null and totalfulfillvolumeweight != ''"> totalFulfillVolumeWeight = #{totalfulfillvolumeweight},</if>
+            <if test="shipat != null and shipat != ''"> shipAt = #{shipat},</if>
             <if test="carriercode != null and carriercode != ''"> carrierCode = #{carriercode},</if>
+            <if test="primarywaybillcode != null and primarywaybillcode != ''"> primaryWaybillCode = #{primarywaybillcode},</if>
             <if test="paymentstatus != null"> paymentStatus = #{paymentstatus},</if>
             <if test="codrequired != null and codrequired != ''"> codRequired = #{codrequired},</if>
             <if test="invoicerequired != null and invoicerequired != ''"> invoiceRequired = #{invoicerequired},</if>
@@ -705,19 +1129,60 @@ update tocofs_saleout  set
             <if test="codamount != null"> codAmount = #{codamount},</if>
             <if test="tax != null"> tax = #{tax},</if>
             <if test="taxpaid != null"> taxPaid = #{taxpaid},</if>
+            <if test="tradesuccessat != null and tradesuccessat != ''"> tradeSuccessAt = #{tradesuccessat},</if>
+            <if test="sourceorderstatus != null and sourceorderstatus != ''"> sourceOrderStatus = #{sourceorderstatus},</if>
             <if test="shiptostatename != null and shiptostatename != ''"> shipToStateName = #{shiptostatename},</if>
             <if test="shiptocityname != null and shiptocityname != ''"> shipToCityName = #{shiptocityname},</if>
             <if test="shiptodistrictname != null and shiptodistrictname != ''"> shipToDistrictName = #{shiptodistrictname},</if>
+            <if test="shipmenttype != null and shipmenttype != ''"> shipmentType = #{shipmenttype},</if>
+            <if test="def1 != null and def1 != ''"> def1 = #{def1},</if>
+            <if test="def2 != null and def2 != ''"> def2 = #{def2},</if>
+            <if test="def3 != null and def3 != ''"> def3 = #{def3},</if>
+            <if test="def4 != null and def4 != ''"> def4 = #{def4},</if>
+            <if test="def5 != null and def5 != ''"> def5 = #{def5},</if>
+            <if test="def6 != null and def6 != ''"> def6 = #{def6},</if>
+            <if test="def7 != null and def7 != ''"> def7 = #{def7},</if>
+            <if test="def8 != null and def8 != ''"> def8 = #{def8},</if>
+            <if test="def9 != null and def9 != ''"> def9 = #{def9},</if>
+            <if test="def10 != null and def10 != ''"> def10 = #{def10},</if>
+            <if test="def11 != null and def11 != ''"> def11 = #{def11},</if>
+            <if test="def12 != null and def12 != ''"> def12 = #{def12},</if>
+            <if test="def13 != null and def13 != ''"> def13 = #{def13},</if>
+            <if test="def14 != null and def14 != ''"> def14 = #{def14},</if>
+            <if test="def15 != null and def15 != ''"> def15 = #{def15},</if>
+            <if test="def16 != null and def16 != ''"> def16 = #{def16},</if>
+            <if test="def17 != null and def17 != ''"> def17 = #{def17},</if>
+            <if test="def18 != null and def18 != ''"> def18 = #{def18},</if>
+            <if test="def19 != null and def19 != ''"> def19 = #{def19},</if>
+            <if test="def20 != null and def20 != ''"> def20 = #{def20},</if>
+            <if test="def21 != null and def21 != ''"> def21 = #{def21},</if>
+            <if test="def22 != null and def22 != ''"> def22 = #{def22},</if>
+            <if test="def23 != null and def23 != ''"> def23 = #{def23},</if>
+            <if test="def24 != null and def24 != ''"> def24 = #{def24},</if>
+            <if test="def25 != null and def25 != ''"> def25 = #{def25},</if>
+            <if test="def26 != null and def26 != ''"> def26 = #{def26},</if>
+            <if test="def27 != null and def27 != ''"> def27 = #{def27},</if>
+            <if test="def28 != null and def28 != ''"> def28 = #{def28},</if>
+            <if test="def29 != null and def29 != ''"> def29 = #{def29},</if>
+            <if test="def30 != null and def30 != ''"> def30 = #{def30},</if>
+            <if test="def31 != null and def31 != ''"> def31 = #{def31},</if>
+            <if test="def32 != null and def32 != ''"> def32 = #{def32},</if>
+            <if test="def33 != null and def33 != ''"> def33 = #{def33},</if>
+            <if test="def34 != null and def34 != ''"> def34 = #{def34},</if>
+            <if test="def35 != null and def35 != ''"> def35 = #{def35},</if>
+            <if test="def36 != null and def36 != ''"> def36 = #{def36},</if>
+            <if test="def37 != null and def37 != ''"> def37 = #{def37},</if>
+            <if test="def38 != null and def38 != ''"> def38 = #{def38},</if>
+            <if test="def39 != null and def39 != ''"> def39 = #{def39},</if>
+            <if test="def40 != null and def40 != ''"> def40 = #{def40},</if>
         </trim>
         where id = #{id}
     </update>
-
     <!-- 逻辑删除 -->
     <update id="entity_logicDelete" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity" >
         update tocofs_saleout  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
         where id = #{id}
     </update>
-
     <!-- 多条件逻辑删除 -->
     <update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.plugin.lets.ofs.entity.TocofsSaleoutEntity" >
         update tocofs_saleout  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
@@ -739,8 +1204,8 @@ update tocofs_saleout  set sts= 'N' ,modify_time = #{modify_time},modify_user_id
             <if test="processtype != null and processtype != ''"> and processType = #{processtype} </if>
             <if test="sourceorderid != null"> and sourceOrderId = #{sourceorderid} </if>
             <if test="sourceordercode != null and sourceordercode != ''"> and sourceOrderCode = #{sourceordercode} </if>
-            <if test="sourceuseraccount != null and sourceuseraccount != ''"> and sourceUserAccount = #{sourceuseraccount} </if>
             <if test="shiptoattentionto != null and shiptoattentionto != ''"> and shipToAttentionTo = #{shiptoattentionto} </if>
+            <if test="sourceuseraccount != null and sourceuseraccount != ''"> and sourceUserAccount = #{sourceuseraccount} </if>
             <if test="shiptoaddress != null and shiptoaddress != ''"> and shipToAddress = #{shiptoaddress} </if>
             <if test="shiptocountry != null and shiptocountry != ''"> and shipToCountry = #{shiptocountry} </if>
             <if test="shiptostate != null and shiptostate != ''"> and shipToState = #{shiptostate} </if>
@@ -760,7 +1225,13 @@ update tocofs_saleout  set sts= 'N' ,modify_time = #{modify_time},modify_user_id
             <if test="totalpayamount != null"> and totalPayAmount = #{totalpayamount} </if>
             <if test="postageamount != null"> and postageAmount = #{postageamount} </if>
             <if test="itemtotalamount != null"> and itemTotalAmount = #{itemtotalamount} </if>
+            <if test="totalfulfillqty != null and totalfulfillqty != ''"> and totalFulfillQty = #{totalfulfillqty} </if>
+            <if test="totalfulfillweight != null and totalfulfillweight != ''"> and totalFulfillWeight = #{totalfulfillweight} </if>
+            <if test="totalfulfillvolume != null and totalfulfillvolume != ''"> and totalFulfillVolume = #{totalfulfillvolume} </if>
+            <if test="totalfulfillvolumeweight != null and totalfulfillvolumeweight != ''"> and totalFulfillVolumeWeight = #{totalfulfillvolumeweight} </if>
+            <if test="shipat != null and shipat != ''"> and shipAt = #{shipat} </if>
             <if test="carriercode != null and carriercode != ''"> and carrierCode = #{carriercode} </if>
+            <if test="primarywaybillcode != null and primarywaybillcode != ''"> and primaryWaybillCode = #{primarywaybillcode} </if>
             <if test="paymentstatus != null"> and paymentStatus = #{paymentstatus} </if>
             <if test="codrequired != null and codrequired != ''"> and codRequired = #{codrequired} </if>
             <if test="invoicerequired != null and invoicerequired != ''"> and invoiceRequired = #{invoicerequired} </if>
@@ -779,17 +1250,57 @@ update tocofs_saleout  set sts= 'N' ,modify_time = #{modify_time},modify_user_id
             <if test="codamount != null"> and codAmount = #{codamount} </if>
             <if test="tax != null"> and tax = #{tax} </if>
             <if test="taxpaid != null"> and taxPaid = #{taxpaid} </if>
+            <if test="tradesuccessat != null and tradesuccessat != ''"> and tradeSuccessAt = #{tradesuccessat} </if>
+            <if test="sourceorderstatus != null and sourceorderstatus != ''"> and sourceOrderStatus = #{sourceorderstatus} </if>
             <if test="shiptostatename != null and shiptostatename != ''"> and shipToStateName = #{shiptostatename} </if>
             <if test="shiptocityname != null and shiptocityname != ''"> and shipToCityName = #{shiptocityname} </if>
             <if test="shiptodistrictname != null and shiptodistrictname != ''"> and shipToDistrictName = #{shiptodistrictname} </if>
+            <if test="shipmenttype != null and shipmenttype != ''"> and shipmentType = #{shipmenttype} </if>
+            <if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
+            <if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
+            <if test="def3 != null and def3 != ''"> and def3 = #{def3} </if>
+            <if test="def4 != null and def4 != ''"> and def4 = #{def4} </if>
+            <if test="def5 != null and def5 != ''"> and def5 = #{def5} </if>
+            <if test="def6 != null and def6 != ''"> and def6 = #{def6} </if>
+            <if test="def7 != null and def7 != ''"> and def7 = #{def7} </if>
+            <if test="def8 != null and def8 != ''"> and def8 = #{def8} </if>
+            <if test="def9 != null and def9 != ''"> and def9 = #{def9} </if>
+            <if test="def10 != null and def10 != ''"> and def10 = #{def10} </if>
+            <if test="def11 != null and def11 != ''"> and def11 = #{def11} </if>
+            <if test="def12 != null and def12 != ''"> and def12 = #{def12} </if>
+            <if test="def13 != null and def13 != ''"> and def13 = #{def13} </if>
+            <if test="def14 != null and def14 != ''"> and def14 = #{def14} </if>
+            <if test="def15 != null and def15 != ''"> and def15 = #{def15} </if>
+            <if test="def16 != null and def16 != ''"> and def16 = #{def16} </if>
+            <if test="def17 != null and def17 != ''"> and def17 = #{def17} </if>
+            <if test="def18 != null and def18 != ''"> and def18 = #{def18} </if>
+            <if test="def19 != null and def19 != ''"> and def19 = #{def19} </if>
+            <if test="def20 != null and def20 != ''"> and def20 = #{def20} </if>
+            <if test="def21 != null and def21 != ''"> and def21 = #{def21} </if>
+            <if test="def22 != null and def22 != ''"> and def22 = #{def22} </if>
+            <if test="def23 != null and def23 != ''"> and def23 = #{def23} </if>
+            <if test="def24 != null and def24 != ''"> and def24 = #{def24} </if>
+            <if test="def25 != null and def25 != ''"> and def25 = #{def25} </if>
+            <if test="def26 != null and def26 != ''"> and def26 = #{def26} </if>
+            <if test="def27 != null and def27 != ''"> and def27 = #{def27} </if>
+            <if test="def28 != null and def28 != ''"> and def28 = #{def28} </if>
+            <if test="def29 != null and def29 != ''"> and def29 = #{def29} </if>
+            <if test="def30 != null and def30 != ''"> and def30 = #{def30} </if>
+            <if test="def31 != null and def31 != ''"> and def31 = #{def31} </if>
+            <if test="def32 != null and def32 != ''"> and def32 = #{def32} </if>
+            <if test="def33 != null and def33 != ''"> and def33 = #{def33} </if>
+            <if test="def34 != null and def34 != ''"> and def34 = #{def34} </if>
+            <if test="def35 != null and def35 != ''"> and def35 = #{def35} </if>
+            <if test="def36 != null and def36 != ''"> and def36 = #{def36} </if>
+            <if test="def37 != null and def37 != ''"> and def37 = #{def37} </if>
+            <if test="def38 != null and def38 != ''"> and def38 = #{def38} </if>
+            <if test="def39 != null and def39 != ''"> and def39 = #{def39} </if>
+            <if test="def40 != null and def40 != ''"> and def40 = #{def40} </if>
             and sts='Y'
         </trim>
     </update>
-
     <!--通过主键删除-->
     <delete id="entity_delete">
         delete from tocofs_saleout where id = #{id}
     </delete>
-
 </mapper>
-

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java

@@ -840,12 +840,12 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
      *
      * @author liuyang
      */
-    private BdTaxitemsEntity queryBdTaxitems(String invcode) {
+//    private BdTaxitemsEntity queryBdTaxitems(String invcode) {
-        Assert.notNull(invcode, "存货编码不能为空");
+//        Assert.notNull(invcode, "存货编码不能为空");
-        BdTaxitemsEntity bdTaxitemsEntity = TocOrderBasicArchivesCacheUtil.stringBdTaxitemsEntityHashMap.get(invcode);
+//        BdTaxitemsEntity bdTaxitemsEntity = TocOrderBasicArchivesCacheUtil.stringBdTaxitemsEntityHashMap.get(invcode);
-        Assert.notNull(bdTaxitemsEntity, "根据存货编码({})，无法匹配到税率！", invcode);
+//        Assert.notNull(bdTaxitemsEntity, "根据存货编码({})，无法匹配到税率！", invcode);
-        return bdTaxitemsEntity;
+//        return bdTaxitemsEntity;
-    }
+//    }
 
     /**
      * 2024年8月20日 16:42:14

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehous.java

@@ -395,8 +395,8 @@ public class ProxyPurchaseWarehous extends PluginBaseEntity {
                                 OfsPoOrderDetails ofsPoOrderDetail = findOfsPoOrderDetail(ofsPoOrderDataDetails, stockinB);
 
                                 //TODO 测试
-                                stockinB.setReceivedQty("1");
+//                                stockinB.setReceivedQty("1");
-                                ofsPoOrderDetail.setFulfillAmount("10");
+//                                ofsPoOrderDetail.setFulfillAmount("10");
 
                                 //2024年8月20日 16:02:21 已经和妮姐、万万确认，采购公司和收货公司目前是一致的，暂时不用区分取数逻辑
                                 BdInvmandocEntity bdInvmandocEntity = queryInventoryMan(stockinB, bdCorpEntity.getPkCorp());

buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java

@@ -382,7 +382,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
                 List<TocofsSaleoutEntity> tocofsSaleoutEntityList = copyHeaderDto(headerDtoList);
                 if (tocofsSaleoutEntityList.size() > 0) {
                     logger.info("TOBofsSaleoutDetailedEntities：插入底表{}个对象（表头）", tocofsSaleoutEntityList.size());
-                    iTocofsSaleoutDao.entityInsertBatchV2(tocofsSaleoutEntityList);
+                    iTocofsSaleoutDao.entityInsertOrUpdateBatch(tocofsSaleoutEntityList);
                 } else {
                     logger.info("TOBofsSaleoutEntityList：没有对象被插入表头底表");
                 }
@@ -395,7 +395,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
                 List<TocofsSaleoutDetailedEntity> tocofsSaleoutDetailedEntities = copyDetailsDto(detailsDtos);
                 if (tocofsSaleoutDetailedEntities.size() > 0) {
                     logger.info("TOBofsSaleoutDetailedEntities：插入底表{}个对象（表体）", tocofsSaleoutDetailedEntities.size());
-                    iTocofsSaleoutDetailedDao.entityInsertBatchV2(tocofsSaleoutDetailedEntities);
+                    iTocofsSaleoutDetailedDao.entityInsertOrUpdateBatch(tocofsSaleoutDetailedEntities);
                 } else {
                     logger.info("TOBofsSaleoutDetailedEntities：没有对象被插入表头底表");
                 }
@@ -1091,9 +1091,16 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
         if (tocofsSaleoutDetailedEntity != null && detailsDto != null && detailsDto.getHeaderDto() != null) {
             HeaderDto headerDto = detailsDto.getHeaderDto();
 
-            tocofsSaleoutDetailedEntity.setPrimaryKey(headerDto.getId());//主表主键
+            if (headerDto.getId() != null) {
-            tocofsSaleoutDetailedEntity.setBusinessDate(headerDto.getShipAt());//业务日期
+                tocofsSaleoutDetailedEntity.setMaintableid(headerDto.getId());//主表主键
-            tocofsSaleoutDetailedEntity.setBusinessType("TOB_ORDER");//业务类型
+            }
+            if (headerDto.getShipAt() != null) {
+                tocofsSaleoutDetailedEntity.setBusinessdate(headerDto.getShipAt());//业务日期-出库日期
+            }
+            if (headerDto.getTradeSuccessAt() != null) {
+                tocofsSaleoutDetailedEntity.setSuccessfultradedate(headerDto.getTradeSuccessAt());//业务日期-交易时间
+            }
+            tocofsSaleoutDetailedEntity.setBusinesstype("TOB_ORDER");//业务类型
         } else {
             logger.info("createPrimaryKeyAndBusinessDateAndBusinessType方法存在false！");
         }
@@ -1471,7 +1478,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
                             isblargessflag = true;
                         }
                         //TODO 测试
-                        detailsDto.setShipQty("1");
+//                        detailsDto.setShipQty("1");
                         SalesInvoiceBodyDto salesInvoiceBodyDto = new SalesInvoiceBodyDto();
                         salesInvoiceBodyDto.setCinventoryid(bdInvmandocEntity.getPkInvmandoc());
                         salesInvoiceBodyDto.setCupreceipttype("4C");//来源单据类型

buildpackage/src/main/java/com/hzya/frame/plugin/lets/resultvo/CacheTocMapVo.java

@@ -0,0 +1,31 @@
+package com.hzya.frame.plugin.lets.resultvo;
+
+import com.hzya.frame.plugin.lets.entity.*;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @Author：liuyang
+ * @Package：com.hzya.frame.plugin.lets.resultvo
+ * @Project：kangarooDataCenterV3
+ * @name：CacheMapVo
+ * @Date：2024/9/4 13:35
+ * @Filename：CacheMapVo
+ */
+@Data
+public class CacheTocMapVo {
+    private Map<String, BdCorpEntity> stringBdCorpEntityMap;
+    private Map<String, BdStordocEntity> stringBdStordocEntityMap;
+    private Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap;
+    private Map<String, BdSalestruEntity> stringBdSalestruEntityMap;
+    private Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap;
+    private Map<String, BdCumandocEntity> stringBdCumandocEntityMap;
+    private Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap;
+    private Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityMap;
+    private Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityMap;
+    private Map<String, BdCubasdocEntity> stringBdCubasdocEntityMap;
+    private Map<String, BdDefdocEntity> stringBdDefdocPlatformEntityMap;
+    private Map<String, BdDefdocEntity> stringBdDefdocShopEntityMap;
+    private Map<String, BdRdclEntity> stringBdRdclEntityMap;
+}

buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/SonDetailsDto.java

@@ -3,6 +3,7 @@ package com.hzya.frame.plugin.lets.u8cdto;
 import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.DetailsDto;
 import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto;
 import com.hzya.frame.plugin.lets.entity.*;
+import lombok.Data;
 
 import java.math.BigDecimal;
 
@@ -14,213 +15,62 @@ import java.math.BigDecimal;
  * @Date：2024/8/5 16:07
  * @Filename：SonDetailsDto
  */
+@Data
 public class SonDetailsDto extends DetailsDto {
-
+    //表头对象
-    /**
-     * 表头对象
-     */
     private HeaderDto header;
 
-    /**
+    //表头公司（销售公司）
-     * 表头公司（销售公司）
-     */
     private BdCorpEntity bdCorpEntity;
 
-    /**
+    //发货库存组织
-     * 发货库存组织
-     */
     private BdCalbodyEntity bdCalbodyEntity;
 
-    /**
+    //发货仓库
-     * 发货仓库
-     */
     private BdStordocEntity bdStordocEntity;
 
-    /**
+    //收货库存组织
-     * 收货库存组织
-     */
     private BdCalbodyEntity bdCalbodyEntity1;
 
-    /**
+    //收货仓库
-     * 收货仓库
-     */
     private BdStordocEntity bdStordocEntity1;
 
-    /**
+    //销售组织
-     * 销售组织
-     */
     private BdSalestruEntity bdSalestruEntity;
 
-    /**
+    //业务部门
-     * 业务部门
-     */
     private BdDeptdocEntity bdDeptdocEntity;
 
-    /**
+    //客商管理档案
-     * 客商管理档案
-     */
     private BdCumandocEntity bdCumandocEntity;
 
-    /**
+    //客商基本档案
-     * 客商基本档案
-     */
     private BdCubasdocEntity bdCubasdocEntity;
 
-    /**
+    //生成汇总维度字符串
-     * 生成汇总维度字符串
-     */
     private String summaryDimensionStr;
 
-    /**
+    //汇总总金额
-     * 汇总总金额
-     */
     private BigDecimal groupTotalPayAmount;
 
-    /**
+    //汇总实发数量
-     * 汇总实发数量
-     */
     private BigDecimal groupShipQty;
 
-    /**
+    //发货公司
-     * 发货公司
-     */
     private BdCorpEntity deliverGoodsCorp;
 
-    /**
+    //U8C平台档案
-     * U8C平台档案
-     */
     private BdDefdocEntity platformArchives;
 
-    /**
+    //U8C店铺档案
-     * U8C店铺档案
-     */
     private BdDefdocEntity shopArchives;
 
-    public BdDefdocEntity getShopArchives() {
+    //存货管理档案，是发货公司的存货档案
-        return shopArchives;
+    private BdInvmandocEntity bdInvmandocEntity;
-    }
 
-    public void setShopArchives(BdDefdocEntity shopArchives) {
+    //存货基本档案
-        this.shopArchives = shopArchives;
+    private BdInvbasdocEntity bdInvbasdocEntity;
-    }
 
-    public BdDefdocEntity getPlatformArchives() {
+    //存货税率
-        return platformArchives;
+    private BdTaxitemsEntity bdTaxitemsEntity;
-    }
-
-    public void setPlatformArchives(BdDefdocEntity platformArchives) {
-        this.platformArchives = platformArchives;
-    }
-
-    public BdCorpEntity getDeliverGoodsCorp() {
-        return deliverGoodsCorp;
-    }
-
-    public void setDeliverGoodsCorp(BdCorpEntity deliverGoodsCorp) {
-        this.deliverGoodsCorp = deliverGoodsCorp;
-    }
-
-    public BigDecimal getGroupShipQty() {
-        return groupShipQty;
-    }
-
-    public void setGroupShipQty(BigDecimal groupShipQty) {
-        this.groupShipQty = groupShipQty;
-    }
-
-    public BigDecimal getGroupTotalPayAmount() {
-        return groupTotalPayAmount;
-    }
-
-    public void setGroupTotalPayAmount(BigDecimal groupTotalPayAmount) {
-        this.groupTotalPayAmount = groupTotalPayAmount;
-    }
-
-    public String getSummaryDimensionStr() {
-        return summaryDimensionStr;
-    }
-
-    public void setSummaryDimensionStr(String summaryDimensionStr) {
-        this.summaryDimensionStr = summaryDimensionStr;
-    }
-
-    public BdCorpEntity getBdCorpEntity() {
-        return bdCorpEntity;
-    }
-
-    public void setBdCorpEntity(BdCorpEntity bdCorpEntity) {
-        this.bdCorpEntity = bdCorpEntity;
-    }
-
-    public BdCalbodyEntity getBdCalbodyEntity() {
-        return bdCalbodyEntity;
-    }
-
-    public void setBdCalbodyEntity(BdCalbodyEntity bdCalbodyEntity) {
-        this.bdCalbodyEntity = bdCalbodyEntity;
-    }
-
-    public BdStordocEntity getBdStordocEntity() {
-        return bdStordocEntity;
-    }
-
-    public void setBdStordocEntity(BdStordocEntity bdStordocEntity) {
-        this.bdStordocEntity = bdStordocEntity;
-    }
-
-    public BdCalbodyEntity getBdCalbodyEntity1() {
-        return bdCalbodyEntity1;
-    }
-
-    public void setBdCalbodyEntity1(BdCalbodyEntity bdCalbodyEntity1) {
-        this.bdCalbodyEntity1 = bdCalbodyEntity1;
-    }
-
-    public BdStordocEntity getBdStordocEntity1() {
-        return bdStordocEntity1;
-    }
-
-    public void setBdStordocEntity1(BdStordocEntity bdStordocEntity1) {
-        this.bdStordocEntity1 = bdStordocEntity1;
-    }
-
-    public BdSalestruEntity getBdSalestruEntity() {
-        return bdSalestruEntity;
-    }
-
-    public void setBdSalestruEntity(BdSalestruEntity bdSalestruEntity) {
-        this.bdSalestruEntity = bdSalestruEntity;
-    }
-
-    public BdDeptdocEntity getBdDeptdocEntity() {
-        return bdDeptdocEntity;
-    }
-
-    public void setBdDeptdocEntity(BdDeptdocEntity bdDeptdocEntity) {
-        this.bdDeptdocEntity = bdDeptdocEntity;
-    }
-
-    public BdCumandocEntity getBdCumandocEntity() {
-        return bdCumandocEntity;
-    }
-
-    public void setBdCumandocEntity(BdCumandocEntity bdCumandocEntity) {
-        this.bdCumandocEntity = bdCumandocEntity;
-    }
-
-    public HeaderDto getHeader() {
-        return header;
-    }
-
-    public void setHeader(HeaderDto header) {
-        this.header = header;
-    }
-
-    public BdCubasdocEntity getBdCubasdocEntity() {
-        return bdCubasdocEntity;
-    }
-
-    public void setBdCubasdocEntity(BdCubasdocEntity bdCubasdocEntity) {
-        this.bdCubasdocEntity = bdCubasdocEntity;
-    }
 }

buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java

@@ -2,6 +2,10 @@ package com.hzya.frame.plugin.lets.util;
 
 import com.hzya.frame.plugin.lets.dao.*;
 import com.hzya.frame.plugin.lets.entity.*;
+import com.hzya.frame.plugin.lets.plugin.sales.SoSaleOutPluginInitializerToC;
+import com.hzya.frame.plugin.lets.resultvo.CacheTocMapVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -22,6 +26,8 @@ import java.util.Map;
 @Component
 public class TocOrderBasicArchivesCacheUtil {
 
+    Logger logger = LoggerFactory.getLogger(TocOrderBasicArchivesCacheUtil.class);
+
     @Autowired
     private IBdCorpDao iBdCorpDao;
 
@@ -55,13 +61,17 @@ public class TocOrderBasicArchivesCacheUtil {
     @Autowired
     private IBdDefdocDao iBdDefdocDao;
 
+    @Autowired
+    private IBdRdclDao iBdRdclDao;
+
     /**
      * 初始化公司档案-表头公司
      * 2024年7月31日 11:16:23
      */
-    public static Map<String, BdCorpEntity> stringBdCorpEntityMap = new HashMap<>();
+//    public static Map<String, BdCorpEntity> stringBdCorpEntityMap = new HashMap<>();
+    private Map<String, BdCorpEntity> initShop() throws Exception {
+        Map<String, BdCorpEntity> stringBdCorpEntityMap = new HashMap<>();
 
-    private void initShop() throws Exception {
         BdCorpEntity bdCorpEntity = new BdCorpEntity();
         bdCorpEntity.setDr(0);
         bdCorpEntity.setDataSourceCode("lets_u8c");
@@ -69,9 +79,10 @@ public class TocOrderBasicArchivesCacheUtil {
         if (bdCorpEntityList != null && bdCorpEntityList.size() > 0) {
             for (int i = 0; i < bdCorpEntityList.size(); i++) {
                 BdCorpEntity bdCorpEntity1 = bdCorpEntityList.get(i);
-                stringBdCorpEntityMap.put(bdCorpEntity1.getUnitname(), bdCorpEntity1);
+                stringBdCorpEntityMap.put(bdCorpEntity1.getUnitcode(), bdCorpEntity1);
             }
         }
+        return stringBdCorpEntityMap;
     }
 
     /**
@@ -79,9 +90,10 @@ public class TocOrderBasicArchivesCacheUtil {
      * 2024年7月31日 11:16:27
      * 202403011513：仓库根据仓库编码+库存组织编码去查询，之前是仓库编码+公司主键，和李佳妮确认好了
      */
-    public static Map<String, BdStordocEntity> stringBdStordocEntityMap = new HashMap<>();
+//    public static Map<String, BdStordocEntity> stringBdStordocEntityMap = new HashMap<>();
+    private Map<String, BdStordocEntity> initBdStordoc() throws Exception {
+        Map<String, BdStordocEntity> stringBdStordocEntityMap = new HashMap<>();
 
-    private void initBdStordoc() throws Exception {
         BdStordocEntity bdStordocEntity = new BdStordocEntity();
         bdStordocEntity.setDr(0L);
         bdStordocEntity.setDataSourceCode("lets_u8c");
@@ -92,14 +104,16 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdStordocEntityMap.put(bdStordocEntity1.getStorcode() + bdStordocEntity1.getPkCalbody(), bdStordocEntity1);
             }
         }
+        return stringBdStordocEntityMap;
     }
 
     /**
      * 2024年7月31日 11:09:12 查询发货库存组织
      */
-    public static Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap = new HashMap<>();
+//    public static Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap = new HashMap<>();
+    private Map<String, BdCalbodyEntity> initBdCalbody() throws Exception {
+        Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap = new HashMap<>();
 
-    private void initBdCalbody() throws Exception {
         BdCalbodyEntity bdCalbodyEntity = new BdCalbodyEntity();
         bdCalbodyEntity.setDr(0);
         bdCalbodyEntity.setDataSourceCode("lets_u8c");
@@ -110,14 +124,16 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdCalbodyEntityMap.put(bdCalbodyEntity1.getPkCorp(), bdCalbodyEntity1);
             }
         }
+        return stringBdCalbodyEntityMap;
     }
 
     /**
      * 初始化销售组织
      */
-    public static Map<String, BdSalestruEntity> stringBdSalestruEntityMap = new HashMap<>();
+//    public static Map<String, BdSalestruEntity> stringBdSalestruEntityMap = new HashMap<>();
+    private Map<String, BdSalestruEntity> initBdSalestru() throws Exception {
+        Map<String, BdSalestruEntity> stringBdSalestruEntityMap = new HashMap<>();
 
-    private void initBdSalestru() throws Exception {
         BdSalestruEntity bdSalestruEntity = new BdSalestruEntity();
         bdSalestruEntity.setDr(0);
         bdSalestruEntity.setDataSourceCode("lets_u8c");
@@ -128,6 +144,7 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdSalestruEntityMap.put(bdSalestruEntity1.getVsalestruname(), bdSalestruEntity1);
             }
         }
+        return stringBdSalestruEntityMap;
     }
 
     /**
@@ -135,9 +152,10 @@ public class TocOrderBasicArchivesCacheUtil {
      *
      * @author liuyang
      */
-    public static Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap = new HashMap<>();
+//    public static Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap = new HashMap<>();
+    private Map<String, BdDeptdocEntity> initDept() {
+        Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap = new HashMap<>();
 
-    private void initDept() {
         BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity();
         bdDeptdocEntity.setDataSourceCode("lets_u8c");
         bdDeptdocEntity.setDr(0);
@@ -149,6 +167,7 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdDeptdocEntityMap.put(bdDeptdocEntity1.getPkCorp(), bdDeptdocEntity1);
             }
         }
+        return stringBdDeptdocEntityMap;
     }
 
     /**
@@ -156,9 +175,10 @@ public class TocOrderBasicArchivesCacheUtil {
      *
      * @author liuyang
      */
-    public static Map<String, BdCubasdocEntity> stringBdCubasdocEntityHashMap = new HashMap<>();
+//    public static Map<String, BdCubasdocEntity> stringBdCubasdocEntityHashMap = new HashMap<>();
+    private Map<String, BdCubasdocEntity> initBdCubasdoc() {
+        Map<String, BdCubasdocEntity> stringBdCubasdocEntityHashMap = new HashMap<>();
 
-    private void initBdCubasdoc() {
         BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity();
         bdCubasdocEntity.setDataSourceCode("lets_u8c");
         bdCubasdocEntity.setDr(0L);
@@ -166,19 +186,25 @@ public class TocOrderBasicArchivesCacheUtil {
         if (bdCumandocEntityList != null && bdCumandocEntityList.size() > 0) {
             for (int i = 0; i < bdCumandocEntityList.size(); i++) {
                 BdCubasdocEntity bdCubasdocEntity1 = bdCumandocEntityList.get(i);
-                stringBdCubasdocEntityHashMap.put(bdCubasdocEntity1.getCustname(), bdCubasdocEntity1);
+                if (stringBdCubasdocEntityHashMap.get(bdCubasdocEntity1.getDef1()) == null) {
+                    stringBdCubasdocEntityHashMap.put(bdCubasdocEntity1.getDef1(), bdCubasdocEntity1);
+                } else {
+                    logger.warn("客商档案def1重复，客商编码：{}", bdCubasdocEntity1.getCustcode());
                 }
             }
         }
+        return stringBdCubasdocEntityHashMap;
+    }
 
     /**
      * 初始化客商管理档案
      *
      * @author liuyang
      */
-    public static Map<String, BdCumandocEntity> stringBdCumandocEntityMap = new HashMap<>();
+//    public static Map<String, BdCumandocEntity> stringBdCumandocEntityMap = new HashMap<>();
+    private Map<String, BdCumandocEntity> initBdCumandoc() {
+        Map<String, BdCumandocEntity> stringBdCumandocEntityMap = new HashMap<>();
 
-    private void initBdCumandoc() {
         BdCumandocEntity bdCumandocEntity1 = new BdCumandocEntity();
         bdCumandocEntity1.setDataSourceCode("lets_u8c");
         bdCumandocEntity1.setDr(0L);
@@ -190,14 +216,16 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdCumandocEntityMap.put(bdCumandocEntity.getPkCubasdoc() + bdCumandocEntity.getPkCorp(), bdCumandocEntity);
             }
         }
+        return stringBdCumandocEntityMap;
     }
 
     /**
      * 初始化存货管理档案
      */
-    public static Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap = new HashMap<>();
+//    public static Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap = new HashMap<>();
+    private Map<String, BdInvmandocEntity> initInventoryFile() throws Exception {
+        Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap = new HashMap<>();
 
-    private void initInventoryFile() throws Exception {
         BdInvmandocEntity bdInvmandocEntity = new BdInvmandocEntity();
 //        bdInvmandocEntity.setInvcode(copyRowDetailsListVo.getSpec_no());
 //        bdInvmandocEntity.setPkCorp(shippingCompanyBdCorpEntity.getPkCorp());
@@ -209,15 +237,17 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdInvmandocEntityMap.put(bdInvmandocEntity1.getInvcode() + bdInvmandocEntity1.getPkCorp(), bdInvmandocEntity1);
             }
         }
+        return stringBdInvmandocEntityMap;
     }
 
     /**
      * 初始化存货基本档案
      * 2024年8月7日 10:57:55
      */
-    public static Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityHashMap = new HashMap<>();
+//    public static Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityHashMap = new HashMap<>();
+    private Map<String, BdInvbasdocEntity> initBasicInventoryFile() throws Exception {
+        Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityHashMap = new HashMap<>();
 
-    private void initBasicInventoryFile() throws Exception {
         BdInvbasdocEntity bdInvbasdocEntity = new BdInvbasdocEntity();
 //        bdInvbasdocEntity.setPk_invmandoc(bdInvmandocEntity1.getPkInvmandoc());
 //        bdInvbasdocEntity.setPk_corp(shippingCompanyBdCorpEntity.getPkCorp());
@@ -228,6 +258,7 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdInvbasdocEntityHashMap.put(bdInvbasdocEntity1.getPk_invmandoc() + bdInvbasdocEntity1.getPk_corp_man(), bdInvbasdocEntity1);
             }
         }
+        return stringBdInvbasdocEntityHashMap;
     }
 
     /**
@@ -236,9 +267,10 @@ public class TocOrderBasicArchivesCacheUtil {
      *
      * @author liuyang
      */
-    public static Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityHashMap = new HashMap<>();
+//    public static Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityHashMap = new HashMap<>();
+    private Map<String, BdTaxitemsEntity> initBdTaxitemsEntity() throws Exception {
+        Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityHashMap = new HashMap<>();
 
-    private void initBdTaxitemsEntity() throws Exception {
         BdTaxitemsEntity bdTaxitemsEntity = new BdTaxitemsEntity();
         List<BdTaxitemsEntity> bdTaxitemsEntityList = iBdTaxitemsDao.queryBdInvbasdocByInvcodeV2(bdTaxitemsEntity);
         if (bdTaxitemsEntityList != null && bdTaxitemsEntityList.size() > 0) {
@@ -247,6 +279,8 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdTaxitemsEntityHashMap.put(bdTaxitemsEntity1.getInvcode(), bdTaxitemsEntity1);
             }
         }
+
+        return stringBdTaxitemsEntityHashMap;
     }
 
     /**
@@ -254,9 +288,10 @@ public class TocOrderBasicArchivesCacheUtil {
      *
      * @author liuyang
      */
-    public static Map<String, BdDefdocEntity> stringBdDefdocEntityHashMap = new HashMap<>();
+//    public static Map<String, BdDefdocEntity> stringBdDefdocEntityHashMap = new HashMap<>();
+    private Map<String, BdDefdocEntity> initSourcePlatform() {
+        Map<String, BdDefdocEntity> stringBdDefdocEntityHashMap = new HashMap<>();
 
-    private void initSourcePlatform() {
         BdDefdocEntity bdDefdocEntity = new BdDefdocEntity();
         bdDefdocEntity.setPkDefdoclist("0001A210000000000JUD");
         bdDefdocEntity.setDr(0);
@@ -268,14 +303,16 @@ public class TocOrderBasicArchivesCacheUtil {
                 stringBdDefdocEntityHashMap.put(bdDefdocEntity1.getDoccode(), bdDefdocEntity1);
             }
         }
+        return stringBdDefdocEntityHashMap;
     }
 
     /**
      * 2024年8月14日 15:17:48 缓存U8C店铺自定义档案逻辑
      */
-    public static Map<String, BdDefdocEntity> shopDefdocEntityHashMap = new HashMap<>();
+//    public static Map<String, BdDefdocEntity> shopDefdocEntityHashMap = new HashMap<>();
+    private Map<String, BdDefdocEntity> initShopDiy() {
+        Map<String, BdDefdocEntity> shopDefdocEntityHashMap = new HashMap<>();
 
-    private void initShopDiy() {
         BdDefdocEntity bdDefdocEntity = new BdDefdocEntity();
         bdDefdocEntity.setPkDefdoclist("0001A210000000000XZX");
         bdDefdocEntity.setDr(0);
@@ -287,6 +324,25 @@ public class TocOrderBasicArchivesCacheUtil {
                 shopDefdocEntityHashMap.put(bdDefdocEntity1.getDoccode(), bdDefdocEntity1);
             }
         }
+        return shopDefdocEntityHashMap;
+    }
+
+    /**
+     * 初始化收发类别
+     */
+    private Map<String, BdRdclEntity> initBdRdcl() {
+        Map<String, BdRdclEntity> stringBdRdclEntityHashMap = new HashMap<>();
+        BdRdclEntity bdRdclEntity = new BdRdclEntity();
+        bdRdclEntity.setDr(0);
+        bdRdclEntity.setDataSourceCode("lets_u8c");
+        List<BdRdclEntity> bdRdclEntityList = iBdRdclDao.query(bdRdclEntity);
+        if (bdRdclEntityList != null && bdRdclEntityList.size() > 0) {
+            for (int i = 0; i < bdRdclEntityList.size(); i++) {
+                BdRdclEntity bdRdclEntity1 = bdRdclEntityList.get(i);
+                stringBdRdclEntityHashMap.put(bdRdclEntity1.getRdcode(), bdRdclEntity1);
+            }
+        }
+        return stringBdRdclEntityHashMap;
     }
 
     /**
@@ -294,40 +350,61 @@ public class TocOrderBasicArchivesCacheUtil {
      *
      * @author liuyang
      */
-    public void clearCache() throws Exception {
+//    public void clearCache() throws Exception {
-        stringBdCorpEntityMap.clear();
+//        stringBdCorpEntityMap.clear();
-        stringBdStordocEntityMap.clear();
+//        stringBdStordocEntityMap.clear();
-        stringBdCalbodyEntityMap.clear();
+//        stringBdCalbodyEntityMap.clear();
-        stringBdSalestruEntityMap.clear();
+//        stringBdSalestruEntityMap.clear();
-        stringBdDeptdocEntityMap.clear();
+//        stringBdDeptdocEntityMap.clear();
-        stringBdCumandocEntityMap.clear();
+//        stringBdCumandocEntityMap.clear();
-        stringBdInvmandocEntityMap.clear();
+//        stringBdInvmandocEntityMap.clear();
-        stringBdInvbasdocEntityHashMap.clear();
+//        stringBdInvbasdocEntityHashMap.clear();
-        stringBdTaxitemsEntityHashMap.clear();
+//        stringBdTaxitemsEntityHashMap.clear();
-        stringBdCubasdocEntityHashMap.clear();
+//        stringBdCubasdocEntityHashMap.clear();
-        stringBdDefdocEntityHashMap.clear();
+//        stringBdDefdocEntityHashMap.clear();
-        shopDefdocEntityHashMap.clear();
+//        shopDefdocEntityHashMap.clear();
-    }
+//    }
 
     /**
      * 初始化缓存
      *
      * @author liuyang
      */
-    public void initCache() throws Exception {
+    public CacheTocMapVo initCache() throws Exception {
-        clearCache();
+//        clearCache();
 
-        initShop();
+        long startMillis = System.currentTimeMillis();
-        initBdStordoc();
+        logger.info("初始化缓存开始");
-        initBdCalbody();
+        Map<String, BdCorpEntity> stringBdCorpEntityMap = initShop();
-        initBdSalestru();
+        Map<String, BdStordocEntity> stringBdStordocEntityMap = initBdStordoc();
-        initDept();
+        Map<String, BdCalbodyEntity> stringBdCalbodyEntityMap = initBdCalbody();
-        initBdCumandoc();
+        Map<String, BdSalestruEntity> stringBdSalestruEntityMap = initBdSalestru();
-        initInventoryFile();
+        Map<String, BdDeptdocEntity> stringBdDeptdocEntityMap = initDept();
-        initBasicInventoryFile();
+        Map<String, BdCumandocEntity> stringBdCumandocEntityMap = initBdCumandoc();
-        initBdTaxitemsEntity();
+        Map<String, BdInvmandocEntity> stringBdInvmandocEntityMap = initInventoryFile();
-        initBdCubasdoc();
+        Map<String, BdInvbasdocEntity> stringBdInvbasdocEntityMap = initBasicInventoryFile();
-        initSourcePlatform();
+        Map<String, BdTaxitemsEntity> stringBdTaxitemsEntityMap = initBdTaxitemsEntity();
-        initShopDiy();
+        Map<String, BdCubasdocEntity> stringBdCubasdocEntityMap = initBdCubasdoc();
+        Map<String, BdDefdocEntity> stringBdDefdocEntityMap = initSourcePlatform();
+        Map<String, BdDefdocEntity> stringBdDefdocEntityMap1 = initShopDiy();
+        Map<String, BdRdclEntity> stringBdRdclEntityMap = initBdRdcl();
+        long endMillis = System.currentTimeMillis();
+        logger.info("初始化缓存完成 耗时：{}", (endMillis - startMillis));
+
+        CacheTocMapVo cacheTocMapVo = new CacheTocMapVo();
+        cacheTocMapVo.setStringBdCorpEntityMap(stringBdCorpEntityMap);
+        cacheTocMapVo.setStringBdStordocEntityMap(stringBdStordocEntityMap);
+        cacheTocMapVo.setStringBdCalbodyEntityMap(stringBdCalbodyEntityMap);
+        cacheTocMapVo.setStringBdSalestruEntityMap(stringBdSalestruEntityMap);
+        cacheTocMapVo.setStringBdDeptdocEntityMap(stringBdDeptdocEntityMap);
+        cacheTocMapVo.setStringBdCumandocEntityMap(stringBdCumandocEntityMap);
+        cacheTocMapVo.setStringBdInvmandocEntityMap(stringBdInvmandocEntityMap);
+        cacheTocMapVo.setStringBdInvbasdocEntityMap(stringBdInvbasdocEntityMap);
+        cacheTocMapVo.setStringBdTaxitemsEntityMap(stringBdTaxitemsEntityMap);
+        cacheTocMapVo.setStringBdCubasdocEntityMap(stringBdCubasdocEntityMap);
+        cacheTocMapVo.setStringBdDefdocPlatformEntityMap(stringBdDefdocEntityMap);
+        cacheTocMapVo.setStringBdDefdocShopEntityMap(stringBdDefdocEntityMap1);
+        cacheTocMapVo.setStringBdRdclEntityMap(stringBdRdclEntityMap);
+        return cacheTocMapVo;
     }
 }

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java

@@ -32,10 +32,10 @@ class SoSaleOutPluginInitializerToCTest {
 
         try {
 //            QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo();
-//            queryOfsSoSaleOutVo.setCode("LETS-SO2024070500000001");
+            soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024081500000001");
 //            soSaleOutPluginInitializerToC.getOfsOrder(queryOfsSoSaleOutVo, 1L);
 
-            soSaleOutPluginInitializerToC.startImplement("2024-04-28 00:00:00", "2024-04-28 23:59:59");
+//            soSaleOutPluginInitializerToC.startImplement("2024-04-28 00:00:00", "2024-04-28 23:59:59");
         } catch (Exception e) {
             e.printStackTrace();
         }

service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/DetailsDto.java

@@ -34,9 +34,6 @@ public class DetailsDto {
     private String createdBy;
     private String lastUpdated;
     private String lastUpdatedBy;
-
+    //表头对象
-    /**
-     * 表头对象
-     */
     private HeaderDto headerDto;
 }

service/src/main/java/com/hzya/frame/ttxofs/dto/ofssaleorderoutsearch/HeaderDto.java

@@ -68,13 +68,9 @@ public class HeaderDto {
     private String tradeSuccessAt;
     private String sourceOrderStatus;
 
-    /**
+    //发货日期
-     * 发货日期
-     */
     private String shipAt;
 
-    /**
+    //出库类型
-     * 出库类型
-     */
     private String shipmentType;
 }