无tms工厂的交货单更新状态和订单数量确认

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -87,6 +87,8 @@ public class RyTask
         sysUserOrderAuthorService.quitUser();
     }
 
+
+
     /**
      *
      * 维护经销商表
@@ -108,4 +110,8 @@ public class RyTask
     public void unionCustomerUser(){
         sysUserOrderAuthorService.unionCustomerUser();
     }
+
+    public void tmsPlantByOrder(){
+        sysUserOrderAuthorService.tmsPlantByOrder();
+    }
 }

suishenbang-system/src/main/java/com/dgtly/system/domain/DeliverQuantityConfirm.java

@@ -0,0 +1,111 @@
+package com.dgtly.system.domain;
+
+
+import com.dgtly.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 交货数量确认 
+ * </p>
+ *
+ * @author csz
+ * @since 2020-08-06
+ */
+@Data
+public class DeliverQuantityConfirm {
+
+    private static final long serialVersionUID = 1L;
+    private Long id;
+
+    private String createBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    private String isDelete;
+
+    private String code;
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 订单行号
+     */
+    private String orderItem;
+
+    /**
+     * 订单生成时间
+     */
+    private String orderCreationTime;
+
+    /**
+     * 订单所属
+     */
+    private String belongTo;
+
+    /**
+     * 交货单号
+     */
+    private String deliveryNumber;
+
+    /**
+     * 交货单行号
+     */
+    private String deliverItem;
+
+    /**
+     * 运单号
+     */
+    private String shipmentNumber;
+
+    /**
+     * 交货地址
+     */
+    private String shipToAddress;
+
+    /**
+     * 物料编号
+     */
+    private String materialCode;
+
+    /**
+     * 物料名称
+     */
+    private String materialName;
+
+    /**
+     * 物料规格
+     */
+    private String sizeDim;
+
+    /**
+     * 交货数量
+     */
+    private BigDecimal deliverQty;
+
+    /**
+     * 交货重量
+     */
+    private BigDecimal deliverWt;
+
+    /**
+     * 确认数量
+     */
+    private BigDecimal confirmQuantity;
+
+
+}

suishenbang-system/src/main/java/com/dgtly/system/domain/MetaHanaDeliverOrder.java

@@ -0,0 +1,121 @@
+package com.dgtly.system.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ */
+@Data
+public class MetaHanaDeliverOrder {
+
+    private static final long serialVersionUID = 1L;
+
+    private String code;
+    private String deliverNumber;
+
+
+    private String deliverItem;
+
+
+    private String docNumber;
+
+
+    private String docItem;
+
+
+    private String salesOrg;
+
+
+    private String salesOrgName;
+
+
+    private String distributionChannel;
+
+
+    private String customerCode;
+
+
+    private String customerName;
+
+
+    private String division;
+
+
+    private String salesGroup;
+
+
+    private String plant;
+
+
+    private String plantName;
+
+
+    private String docType;
+
+
+    private String deliverType;
+
+
+    private String materialCode;
+
+
+    private String materialName;
+
+
+    private String sizeDim;
+
+
+    private String shipmentNumber;
+
+
+    private String shipmentCreateDate;
+
+
+    private String shipToAddress;
+
+    private String createDateDoc;
+
+
+    private String createDateDocItem;
+
+
+    private String createDateDeliver;
+
+
+    private String actualDeliverDate;
+
+
+    private String planDeliverDate;
+
+
+    private String requestDeliverDate;
+
+
+    private String requestDeliverDateItem;
+
+
+    private String reviewStatus;
+
+
+    private BigDecimal orderQty;
+
+
+    private BigDecimal orderWt;
+
+
+    private BigDecimal deliverQty;
+
+
+    private BigDecimal deliverWt;
+
+
+    private BigDecimal netValue;
+
+
+    private String postingDate;
+
+
+    private String expressInfo;
+
+}

suishenbang-system/src/main/java/com/dgtly/system/mapper/DeliverQuantityConfirmMapper.java

@@ -0,0 +1,48 @@
+package com.dgtly.system.mapper;
+
+import com.dgtly.system.domain.DeliverQuantityConfirm;
+import com.dgtly.system.domain.TmsLogisticsStatus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 交货数量确认Mapper接口
+ *
+ * @author dgtly
+ * @date 2022-11-29
+ */
+public interface DeliverQuantityConfirmMapper
+{
+    /**
+     * 查询交货数量确认
+     *
+     * @param id 交货数量确认ID
+     * @return 交货数量确认
+     */
+    public DeliverQuantityConfirm selectDeliverQuantityConfirmById(Long id);
+
+    /**
+     * 查询交货数量确认列表
+     *
+     * @param deliverQuantityConfirm 交货数量确认
+     * @return 交货数量确认集合
+     */
+    public List<DeliverQuantityConfirm> selectDeliverQuantityConfirmList(DeliverQuantityConfirm deliverQuantityConfirm);
+
+    /**
+     * 新增交货数量确认
+     *
+     * @param deliverQuantityConfirm 交货数量确认
+     * @return 结果
+     */
+    public int insertDeliverQuantityConfirm(DeliverQuantityConfirm deliverQuantityConfirm);
+
+   void  saveDeliverNumber(@Param("list") List<DeliverQuantityConfirm> list);
+
+
+
+
+
+
+}

suishenbang-system/src/main/java/com/dgtly/system/mapper/MetaHanaDeliverOrderMapper.java

@@ -0,0 +1,14 @@
+package com.dgtly.system.mapper;
+
+
+import com.dgtly.system.domain.MetaHanaDeliverOrder;
+
+import java.util.List;
+
+/**
+ *
+ */
+public interface MetaHanaDeliverOrderMapper {
+
+    List<MetaHanaDeliverOrder> selectMetaDeliverOrderList();
+}

suishenbang-system/src/main/java/com/dgtly/system/mapper/SysBatchSignForMapper.java

@@ -25,4 +25,8 @@ public interface SysBatchSignForMapper {
     void saveDeliverOrderBaseList(@Param("list") List<DeliverOrderBase> list2);
 
     List<Map<String, String>> selectByDeliveryNumber(@Param("list") List<String> listData);
+
+    List<TmsLogisticsStatus> selectByDelivery();
+
+    void updateBatchTmsStatus(@Param("list") List<TmsLogisticsStatus> list);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserOrderAuthorService.java

@@ -100,4 +100,11 @@ public interface ISysUserOrderAuthorService
     void sendmailUnionUser();
 
     void unionCustomerUser();
+
+    /**
+     *
+     * 无tms工厂的交货单更新状态和订单
+     */
+    void tmsPlantByOrder();
+
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -1,5 +1,7 @@
 package com.dgtly.system.service.impl;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -53,6 +55,12 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
     private AssRelcustomerinfoMapper relcustomerinfoMapper;
     @Autowired
     private MailUtils mailUtils;
+    @Autowired
+    private MetaHanaDeliverOrderMapper metaHanaDeliverOrderMapper;
+    @Autowired
+    private DeliverQuantityConfirmMapper deliverQuantityConfirmMapper;
+    @Autowired
+    private SysBatchSignForMapper sysBatchSignForMapper;
 
     @Autowired
     private CustomerMapper customersMapper;
@@ -470,6 +478,150 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         });*/
     }
 
+    /**
+     * 无tms工厂的交货单更新状态和订单
+     */
+    @Override
+    public void tmsPlantByOrder() {
+        List<TmsLogisticsStatus> tmslist = new ArrayList<TmsLogisticsStatus>();
+        List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();
+        List<TmsLogisticsStatus> tmsStatusLog=sysBatchSignForMapper.selectByDelivery();
+        List<TmsLogisticsStatus> tmsStatus5list = new ArrayList<TmsLogisticsStatus>();
+        Map<Object,List<TmsLogisticsStatus>> keytmsMap=new HashMap<>();
+       if(tmsStatusLog !=null && tmsStatusLog.size()>0){
+           keytmsMap=tmsStatusLog.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
+       }
+        DeliverQuantityConfirm numbernull=new DeliverQuantityConfirm();
+        List<DeliverQuantityConfirm> deliverNumber=deliverQuantityConfirmMapper.selectDeliverQuantityConfirmList(numbernull);
+        List<String> deliverNumbers=new ArrayList<>();
+        if(deliverNumber !=null && deliverNumber.size()>0){
+         deliverNumbers = deliverNumber.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
+        }
+        List<MetaHanaDeliverOrder> deliverOrderList=metaHanaDeliverOrderMapper.selectMetaDeliverOrderList();
+        if(deliverOrderList !=null && deliverOrderList.size()>0){
+            for (MetaHanaDeliverOrder deliver:deliverOrderList
+                 ) {
+                if(("未复核").equals(deliver.getReviewStatus())){
+                    List<String> tms = tmslist.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
+                    if((keytmsMap ==null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber())) ){
+                               TmsLogisticsStatus tmsLogisticsStatus=new TmsLogisticsStatus();
+                               tmsLogisticsStatus.setCreateBy("HBS");
+                               tmsLogisticsStatus.setCreateTime(new Date());
+                               tmsLogisticsStatus.setUpdateBy("HBS");
+                               tmsLogisticsStatus.setUpdateTime(new Date());
+                               tmsLogisticsStatus.setIsDelete("0");
+                               tmsLogisticsStatus.setOrderCreationTime("");
+                               tmsLogisticsStatus.setDeliveryNumber(deliver.getDeliverNumber());
+                               if(("").equals(deliver.getShipmentNumber()) || deliver.getShipmentNumber()==null || ("null").equals(deliver.getShipmentNumber()) ){
+                                   tmsLogisticsStatus.setTmsShipmentNumber(deliver.getDeliverNumber());
+                               }else{
+                                   tmsLogisticsStatus.setTmsShipmentNumber(deliver.getShipmentNumber());
+                               }
+                               tmsLogisticsStatus.setStatus("1");
+                               tmsLogisticsStatus.setDriverName("HBS");
+                               tmsLogisticsStatus.setCarNumber("好邦手");
+                               tmsLogisticsStatus.setDriverPhone("13888888888");
+                               tmsLogisticsStatus.setCustomerCode(deliver.getCustomerCode());
+                               tmsLogisticsStatus.setOrderNumber(deliver.getDocNumber());
+                               tmsLogisticsStatus.setAssignTime(new Date());
+                               tmsLogisticsStatus.setTransferOrder("n");
+                               tmslist.add(tmsLogisticsStatus);
+                    }
+                }else if(("已复核").equals(deliver.getReviewStatus())){
+                    List<String> tms = tmslist.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
+                        if((keytmsMap ==null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber())  && !tms.contains(deliver.getDeliverNumber()))){
+                                TmsLogisticsStatus tmsLogisticsStatus=new TmsLogisticsStatus();
+                                tmsLogisticsStatus.setCreateBy("HBS");
+                                tmsLogisticsStatus.setCreateTime(new Date());
+                                tmsLogisticsStatus.setUpdateBy("HBS");
+                                tmsLogisticsStatus.setUpdateTime(new Date());
+                                tmsLogisticsStatus.setIsDelete("0");
+                                tmsLogisticsStatus.setOrderCreationTime("");
+                                tmsLogisticsStatus.setDeliveryNumber(deliver.getDeliverNumber());
+                                if(("").equals(deliver.getShipmentNumber()) || deliver.getShipmentNumber()==null || ("null").equals(deliver.getShipmentNumber()) ){
+                                    tmsLogisticsStatus.setTmsShipmentNumber(deliver.getDeliverNumber());
+                                }else{
+                                    tmsLogisticsStatus.setTmsShipmentNumber(deliver.getShipmentNumber());
+                                }
+                                tmsLogisticsStatus.setStatus("5");
+                                tmsLogisticsStatus.setDriverName("HBS");
+                                tmsLogisticsStatus.setCarNumber("好邦手");
+                                tmsLogisticsStatus.setDriverPhone("13888888888");
+                                tmsLogisticsStatus.setCustomerCode(deliver.getCustomerCode());
+                                tmsLogisticsStatus.setOrderNumber(deliver.getDocNumber());
+                                tmsLogisticsStatus.setAssignTime(new Date());
+                                tmsLogisticsStatus.setTransferOrder("n");
+                                String time=deliver.getPostingDate();
+                                Date date = new Date();
+                                try {
+                                    date = new SimpleDateFormat("yyyyMMdd").parse(time);
+                                } catch (ParseException e) {
+                                    //LOGGER.error("时间转换错误, string = {}", s, e);
+                                }
+                                tmsLogisticsStatus.setArrivalGoodsTime(date);
+                                tmslist.add(tmsLogisticsStatus);
+               } else if(keytmsMap !=null && keytmsMap.containsKey(deliver.getDeliverNumber())){
+                    List<TmsLogisticsStatus> tmsStatusList= keytmsMap.get(deliver.getDeliverNumber());
+                    if(tmsStatusList !=null && tmsStatusList.size()>0){
+                        Optional<TmsLogisticsStatus> tmsStatus = tmsStatusList.stream().filter(org -> Objects.equals(org.getDeliveryNumber(), deliver.getDeliverNumber())).findFirst();
+                        if(!tmsStatus.get().getStatus().equals("5")){
+                            tmsStatus.get().setStatus("5");
+                            String time=deliver.getPostingDate();
+                            Date date = new Date();
+                            try {
+                                date = new SimpleDateFormat("yyyyMMdd").parse(time);
+                            } catch (ParseException e) {
+                                //LOGGER.error("时间转换错误, string = {}", s, e);
+                            }
+                            tmsStatus.get().setArrivalGoodsTime(date);
+                            tmsStatus.get().setUpdateTime(new Date());
+                            tmsStatus5list.add(tmsStatus.get());
+                        }
+                    }
+                    List<String> newdeliver = deliverlist.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
+                        if(( deliverNumbers.size()==0 && ! newdeliver.contains(deliver.getCode())) || ( !deliverNumbers.contains(deliver.getCode()) && ! newdeliver.contains(deliver.getCode()) )){
+                            DeliverQuantityConfirm number=new DeliverQuantityConfirm();
+                            number.setCreateBy("HBS");
+                            number.setCreateTime(new Date());
+                            number.setUpdateBy("HBS");
+                            number.setUpdateTime(new Date());
+                            number.setIsDelete("0");
+                            number.setOrderNumber(deliver.getDocNumber());
+                            number.setOrderItem(deliver.getDocItem());
+                            number.setOrderCreationTime(deliver.getCreateDateDoc());
+                            number.setBelongTo(deliver.getCustomerCode());
+                            number.setCode(deliver.getDeliverNumber()+deliver.getDeliverItem());
+                            if(("").equals(deliver.getShipmentNumber()) || deliver.getShipmentNumber()==null || ("null").equals(deliver.getShipmentNumber()) ){
+                                number.setShipmentNumber(deliver.getDeliverNumber());
+                            }else{
+                                number.setShipmentNumber(deliver.getShipmentNumber());
+                            }
+                            number.setDeliverItem(deliver.getDeliverItem());
+                            number.setShipToAddress(deliver.getShipToAddress());
+                            number.setMaterialCode(deliver.getMaterialCode());
+                            number.setMaterialName(deliver.getMaterialName());
+                            number.setSizeDim(deliver.getSizeDim());
+                            number.setDeliverQty(deliver.getDeliverQty());
+                            number.setDeliverWt(deliver.getDeliverWt());
+                            number.setConfirmQuantity(deliver.getDeliverQty());
+                            deliverlist.add(number);
+                    }
+                }
+                }
+            }
+            if(tmslist !=null && tmslist.size()>0){
+                sysBatchSignForMapper.saveTmsLogisticsStatus(tmslist);
+            }
+            if(tmsStatus5list !=null && tmsStatus5list.size()>0) {
+                sysBatchSignForMapper.updateBatchTmsStatus(tmsStatus5list);
+            }
+            if(deliverlist !=null && deliverlist.size()>0){
+                deliverQuantityConfirmMapper.saveDeliverNumber(deliverlist);
+            }
+        }
+
+    }
+
     public Set<String> getConfigValueSet(String dictType){
             Set<String> res = new HashSet<>();
             List<SysDictData> dictDatas = sysDictDataService.selectSimpleDictDataByType(dictType);

suishenbang-system/src/main/resources/mapper/system/DeliverQuantityConfirmMapper.xml

@@ -0,0 +1,116 @@
+<?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.dgtly.system.mapper.DeliverQuantityConfirmMapper">
+    <resultMap type="com.dgtly.system.domain.DeliverQuantityConfirm" id="DeliverQuantityConfirmResult">
+        <result property="orderNumber"    column="order_number"    />
+        <result property="orderItem"    column="order_item"    />
+        <result property="orderCreationTime"    column="order_creation_time"    />
+        <result property="belongTo"    column="belong_to"    />
+        <result property="deliveryNumber"    column="delivery_number"    />
+        <result property="deliverItem"    column="deliver_item"    />
+        <result property="shipmentNumber"    column="shipment_number"    />
+        <result property="shipToAddress"    column="ship_to_address"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="sizeDim"    column="size_dim"    />
+        <result property="deliverQty"    column="deliver_qty"    />
+        <result property="deliverWt"    column="deliver_wt"    />
+        <result property="confirmQuantity"    column="confirm_quantity"    />
+    </resultMap>
+
+    <sql id="selectDeliverQuantityConfirmVo">
+        select id, create_by, create_time, update_by, update_time, is_delete, order_number, order_item, order_creation_time, belong_to, delivery_number, deliver_item,(delivery_number+deliver_item)as code, shipment_number, ship_to_address, material_code, material_name, size_dim, deliver_qty, deliver_wt, confirm_quantity from deliver_quantity_confirm
+    </sql>
+
+    <select id="selectDeliverQuantityConfirmList" parameterType="DeliverQuantityConfirm" resultMap="DeliverQuantityConfirmResult">
+        <include refid="selectDeliverQuantityConfirmVo"/>
+        <where>
+            <if test="isDelete != null  and isDelete != ''"> and is_delete = #{isDelete}</if>
+            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
+            <if test="orderItem != null  and orderItem != ''"> and order_item = #{orderItem}</if>
+            <if test="orderCreationTime != null  and orderCreationTime != ''"> and order_creation_time = #{orderCreationTime}</if>
+            <if test="belongTo != null  and belongTo != ''"> and belong_to = #{belongTo}</if>
+            <if test="deliveryNumber != null  and deliveryNumber != ''"> and delivery_number = #{deliveryNumber}</if>
+            <if test="deliverItem != null  and deliverItem != ''"> and deliver_item = #{deliverItem}</if>
+            <if test="shipmentNumber != null  and shipmentNumber != ''"> and shipment_number = #{shipmentNumber}</if>
+            <if test="shipToAddress != null  and shipToAddress != ''"> and ship_to_address = #{shipToAddress}</if>
+            <if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="sizeDim != null  and sizeDim != ''"> and size_dim = #{sizeDim}</if>
+            <if test="deliverQty != null "> and deliver_qty = #{deliverQty}</if>
+            <if test="deliverWt != null "> and deliver_wt = #{deliverWt}</if>
+            <if test="confirmQuantity != null "> and confirm_quantity = #{confirmQuantity}</if>
+        </where>
+    </select>
+
+    <select id="selectDeliverQuantityConfirmById" parameterType="Long" resultMap="DeliverQuantityConfirmResult">
+        <include refid="selectDeliverQuantityConfirmVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertDeliverQuantityConfirm" parameterType="DeliverQuantityConfirm" useGeneratedKeys="true" keyProperty="id">
+        insert into deliver_quantity_confirm
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="createBy != null  and createBy != ''">create_by,</if>
+            <if test="createTime != null ">create_time,</if>
+            <if test="updateBy != null  and updateBy != ''">update_by,</if>
+            <if test="updateTime != null ">update_time,</if>
+            <if test="isDelete != null  and isDelete != ''">is_delete,</if>
+            <if test="orderNumber != null  and orderNumber != ''">order_number,</if>
+            <if test="orderItem != null  and orderItem != ''">order_item,</if>
+            <if test="orderCreationTime != null  and orderCreationTime != ''">order_creation_time,</if>
+            <if test="belongTo != null  and belongTo != ''">belong_to,</if>
+            <if test="deliveryNumber != null  and deliveryNumber != ''">delivery_number,</if>
+            <if test="deliverItem != null  and deliverItem != ''">deliver_item,</if>
+            <if test="shipmentNumber != null  and shipmentNumber != ''">shipment_number,</if>
+            <if test="shipToAddress != null  and shipToAddress != ''">ship_to_address,</if>
+            <if test="materialCode != null  and materialCode != ''">material_code,</if>
+            <if test="materialName != null  and materialName != ''">material_name,</if>
+            <if test="sizeDim != null  and sizeDim != ''">size_dim,</if>
+            <if test="deliverQty != null ">deliver_qty,</if>
+            <if test="deliverWt != null ">deliver_wt,</if>
+            <if test="confirmQuantity != null ">confirm_quantity,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="createBy != null  and createBy != ''">#{createBy},</if>
+            <if test="createTime != null ">#{createTime},</if>
+            <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null ">#{updateTime},</if>
+            <if test="isDelete != null  and isDelete != ''">#{isDelete},</if>
+            <if test="orderNumber != null  and orderNumber != ''">#{orderNumber},</if>
+            <if test="orderItem != null  and orderItem != ''">#{orderItem},</if>
+            <if test="orderCreationTime != null  and orderCreationTime != ''">#{orderCreationTime},</if>
+            <if test="belongTo != null  and belongTo != ''">#{belongTo},</if>
+            <if test="deliveryNumber != null  and deliveryNumber != ''">#{deliveryNumber},</if>
+            <if test="deliverItem != null  and deliverItem != ''">#{deliverItem},</if>
+            <if test="shipmentNumber != null  and shipmentNumber != ''">#{shipmentNumber},</if>
+            <if test="shipToAddress != null  and shipToAddress != ''">#{shipToAddress},</if>
+            <if test="materialCode != null  and materialCode != ''">#{materialCode},</if>
+            <if test="materialName != null  and materialName != ''">#{materialName},</if>
+            <if test="sizeDim != null  and sizeDim != ''">#{sizeDim},</if>
+            <if test="deliverQty != null ">#{deliverQty},</if>
+            <if test="deliverWt != null ">#{deliverWt},</if>
+            <if test="confirmQuantity != null ">#{confirmQuantity},</if>
+        </trim>
+    </insert>
+
+    <insert id="saveDeliverNumber" parameterType="com.dgtly.system.domain.DeliverQuantityConfirm">
+        insert into
+        deliver_quantity_confirm(
+        create_by,create_time,update_by,update_time,is_delete,order_number, order_item, order_creation_time, belong_to, delivery_number, deliver_item, shipment_number, ship_to_address, material_code, material_name, size_dim, deliver_qty, deliver_wt, confirm_quantity
+        )
+        values
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},
+            #{item.isDelete},#{item.orderNumber},#{item.orderItem},
+            #{item.orderCreationTime},#{item.belongTo},#{item.deliveryNumber},
+            #{item.deliverItem},#{item.shipmentNumber},#{item.shipToAddress},#{item.materialCode},
+            #{item.materialName},#{item.sizeDim},#{item.deliverQty},
+            #{item.deliverWt},#{item.confirmQuantity}
+            )
+        </foreach>
+    </insert>
+
+
+</mapper>

suishenbang-system/src/main/resources/mapper/system/MetaHanaDeliverOrderMapper.xml

@@ -0,0 +1,31 @@
+<?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.dgtly.system.mapper.MetaHanaDeliverOrderMapper">
+
+    <select id="selectMetaDeliverOrderList" resultType="com.dgtly.system.domain.MetaHanaDeliverOrder">
+        SELECT
+            ( m.DELIVER_NUMBER+m.DELIVER_ITEM) as code,
+            m.DELIVER_NUMBER as deliverNumber,
+            m.DELIVER_ITEM as deliverItem,
+            m.DOC_NUMBER as docNumber,
+            m.DOC_ITEM as docItem,
+            m.CREATE_DATE_DOC as createDateDoc,
+            m.CUSTOMER_CODE as customerCode,
+            m.CUSTOMER_NAME as customerName,
+            m.PLANT,
+            m.PLANT_NAME as plantName,
+            m.MATERIAL_CODE as materialCode,
+            m.MATERIAL_NAME as materialName,
+            m.SIZE_DIM as sizeDim,
+            m.SHIPMENT_NUMBER as shipmentNumber,
+            m.SHIP_TO_ADDRESS as shipToAddress,
+            m.REVIEW_STATUS as reviewStatus,
+            m.DELIVER_WT as deliverWt,
+            m.DELIVER_QTY as deliverQty,
+            m.NET_VALUE as netValue,
+            m.POSTING_DATE as postingDate
+        FROM
+            meta_hana_deliver_order m  where m.PLANT not in(select plant_code from tms_plant)
+           and m.REVIEW_STATUS !='' and m.REVIEW_STATUS is not null
+    </select>
+</mapper>

suishenbang-system/src/main/resources/mapper/system/SysBatchSignForMapper.xml

@@ -27,7 +27,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
-
+    <update id="updateBatchTmsStatus" parameterType="java.util.List">
+        <foreach item="item" index="index" collection="list" open="" separator=";" close="">
+            update tms_logistics_status
+            <set>
+                create_by =#{item.item.createBy},
+                create_time =#{item.createTime},
+                update_by =#{item.updateBy},
+                update_time =#{item.updateTime},
+                is_delete =#{item.isDelete},
+                order_number =#{item.orderNumber},
+                order_creation_time =#{item.orderCreationTime},
+                delivery_number =#{item.deliveryNumber},
+                tms_shipment_number =#{item.tmsShipmentNumber},
+                customer_code =#{item.customerCode},
+                status =#{item.status},
+                driver_name =#{item.driverName},
+                car_number =#{item.carNumber},
+                driver_phone =#{item.driverPhone},
+                assign_time =#{item.assignTime},
+                get_goods_time =#{item.getGoodsTime},
+                factory_time =#{item.factoryTime},
+                arrival_goods_time =#{item.arrivalGoodsTime},
+                transfer_order =#{item.transferOrder}
+            </set>
+                where id=#{item.id}
+        </foreach>
+    </update>
 
     <insert id="saveDeliverOrderBaseList" parameterType="com.dgtly.system.domain.DeliverOrderBase">
         insert into
@@ -78,6 +104,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
         GROUP BY DELIVER_NUMBER
     </select>
-
+    
+    <select id="selectByDelivery" resultType="com.dgtly.system.domain.TmsLogisticsStatus">
+        SELECT
+            id,create_by as createBy,create_time as createTime,update_by as updateBy,update_time as updateTime,is_delete as isDelete,
+            order_number as orderNumber,
+            order_creation_time as orderCreationTime,
+            delivery_number as deliveryNumber,
+            tms_shipment_number as tmsShipmentNumber,
+            customer_code as customerCode,
+            STATUS as status,
+            driver_name as driverName,
+            car_number as carNumber,
+            driver_phone as driverPhone,
+            assign_time as assignTime,
+            get_goods_time as getGoodsTime,
+            factory_time as factoryTime,
+            arrival_goods_time as arrivalGoodsTime,
+            transfer_order as transferOrder
+        FROM
+            tms_logistics_status
+    where 1=1
+      and is_delete=0
+    </select>
 
 </mapper>