数据分流

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

@@ -3,10 +3,7 @@ package com.dgtly.system.domain;
 
 import com.dgtly.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
@@ -20,9 +17,6 @@ import java.util.Date;
  * @author csz
  * @since 2020-08-06
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class DeliverQuantityConfirm {
 
     private static final long serialVersionUID = 1L;
@@ -111,5 +105,198 @@ public class DeliverQuantityConfirm {
      */
     private BigDecimal confirmQuantity;
 
+    public Long getId() {
+        return id;
+    }
 
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(String isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderItem() {
+        return orderItem;
+    }
+
+    public void setOrderItem(String orderItem) {
+        this.orderItem = orderItem;
+    }
+
+    public String getOrderCreationTime() {
+        return orderCreationTime;
+    }
+
+    public void setOrderCreationTime(String orderCreationTime) {
+        this.orderCreationTime = orderCreationTime;
+    }
+
+    public String getBelongTo() {
+        return belongTo;
+    }
+
+    public void setBelongTo(String belongTo) {
+        this.belongTo = belongTo;
+    }
+
+    public String getDeliveryNumber() {
+        return deliveryNumber;
+    }
+
+    public void setDeliveryNumber(String deliveryNumber) {
+        this.deliveryNumber = deliveryNumber;
+    }
+
+    public String getDeliverItem() {
+        return deliverItem;
+    }
+
+    public void setDeliverItem(String deliverItem) {
+        this.deliverItem = deliverItem;
+    }
+
+    public String getShipmentNumber() {
+        return shipmentNumber;
+    }
+
+    public void setShipmentNumber(String shipmentNumber) {
+        this.shipmentNumber = shipmentNumber;
+    }
+
+    public String getShipToAddress() {
+        return shipToAddress;
+    }
+
+    public void setShipToAddress(String shipToAddress) {
+        this.shipToAddress = shipToAddress;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public String getSizeDim() {
+        return sizeDim;
+    }
+
+    public void setSizeDim(String sizeDim) {
+        this.sizeDim = sizeDim;
+    }
+
+    public BigDecimal getDeliverQty() {
+        return deliverQty;
+    }
+
+    public void setDeliverQty(BigDecimal deliverQty) {
+        this.deliverQty = deliverQty;
+    }
+
+    public BigDecimal getDeliverWt() {
+        return deliverWt;
+    }
+
+    public void setDeliverWt(BigDecimal deliverWt) {
+        this.deliverWt = deliverWt;
+    }
+
+    public BigDecimal getConfirmQuantity() {
+        return confirmQuantity;
+    }
+
+    public void setConfirmQuantity(BigDecimal confirmQuantity) {
+        this.confirmQuantity = confirmQuantity;
+    }
+
+    public DeliverQuantityConfirm() {
+    }
+
+    public DeliverQuantityConfirm(Long id, String createBy, Date createTime, String updateBy, Date updateTime, String isDelete, String code, String orderNumber, String orderItem, String orderCreationTime, String belongTo, String deliveryNumber, String deliverItem, String shipmentNumber, String shipToAddress, String materialCode, String materialName, String sizeDim, BigDecimal deliverQty, BigDecimal deliverWt, BigDecimal confirmQuantity) {
+        this.id = id;
+        this.createBy = createBy;
+        this.createTime = createTime;
+        this.updateBy = updateBy;
+        this.updateTime = updateTime;
+        this.isDelete = isDelete;
+        this.code = code;
+        this.orderNumber = orderNumber;
+        this.orderItem = orderItem;
+        this.orderCreationTime = orderCreationTime;
+        this.belongTo = belongTo;
+        this.deliveryNumber = deliveryNumber;
+        this.deliverItem = deliverItem;
+        this.shipmentNumber = shipmentNumber;
+        this.shipToAddress = shipToAddress;
+        this.materialCode = materialCode;
+        this.materialName = materialName;
+        this.sizeDim = sizeDim;
+        this.deliverQty = deliverQty;
+        this.deliverWt = deliverWt;
+        this.confirmQuantity = confirmQuantity;
+    }
 }

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

@@ -6,8 +6,6 @@ import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
-@AllArgsConstructor
-@NoArgsConstructor
 public class TmsLogisticsStatus {
 
 	private Long id;
@@ -216,4 +214,30 @@ public class TmsLogisticsStatus {
 	public void setTransferOrder(String transferOrder) {
 		this.transferOrder = transferOrder;
 	}
+
+	public TmsLogisticsStatus() {
+	}
+
+	public TmsLogisticsStatus(Long id, String createBy, Date createTime, String updateBy, Date updateTime, String isDelete, String orderNumber, String orderCreationTime, String deliveryNumber, String tmsShipmentNumber, String customerCode, String status, String driverName, String carNumber, String driverPhone, Date assignTime, Date getGoodsTime, Date factoryTime, Date arrivalGoodsTime, String transferOrder) {
+		this.id = id;
+		this.createBy = createBy;
+		this.createTime = createTime;
+		this.updateBy = updateBy;
+		this.updateTime = updateTime;
+		this.isDelete = isDelete;
+		this.orderNumber = orderNumber;
+		this.orderCreationTime = orderCreationTime;
+		this.deliveryNumber = deliveryNumber;
+		this.tmsShipmentNumber = tmsShipmentNumber;
+		this.customerCode = customerCode;
+		this.status = status;
+		this.driverName = driverName;
+		this.carNumber = carNumber;
+		this.driverPhone = driverPhone;
+		this.assignTime = assignTime;
+		this.getGoodsTime = getGoodsTime;
+		this.factoryTime = factoryTime;
+		this.arrivalGoodsTime = arrivalGoodsTime;
+		this.transferOrder = transferOrder;
+	}
 }

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

@@ -2,6 +2,7 @@ package com.dgtly.system.mapper;
 
 
 import com.dgtly.system.domain.MetaHanaDeliverOrder;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -10,9 +11,11 @@ import java.util.List;
  */
 public interface MetaHanaDeliverOrderMapper {
 
-    public List<MetaHanaDeliverOrder> selectMetaDeliverOrderListByNo();
+    public List<MetaHanaDeliverOrder> selectMetaDeliverOrderListByNo(@Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize);
 
-    public List<MetaHanaDeliverOrder> selectMetaDeliverOrderListByYes();
+   // public List<MetaHanaDeliverOrder> selectMetaDeliverOrderListByYes(@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize);
+
+   int  selectCount();
 
     public  List<String> selectPlant();
 }

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

@@ -483,84 +483,82 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
      */
     @Override
     public void tmsPlantByOrder() {
-        List<String> plants=metaHanaDeliverOrderMapper.selectPlant();
-        List<TmsLogisticsStatus> tmsStatusLog=sysBatchSignForMapper.selectByDelivery();
-        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<String> plants = metaHanaDeliverOrderMapper.selectPlant();
+        List<TmsLogisticsStatus> tmsStatusLog = sysBatchSignForMapper.selectByDelivery();
+        Map<Object, List<TmsLogisticsStatus>> keytmsMap = new HashMap<>();
+        if (tmsStatusLog != null && tmsStatusLog.size() > 0) {
+            keytmsMap = tmsStatusLog.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
         }
-        List<MetaHanaDeliverOrder> deliverOrderListstatusNo=metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByNo();
-        if(deliverOrderListstatusNo !=null && deliverOrderListstatusNo.size()>0){
-            List<TmsLogisticsStatus> tmslistNo = new ArrayList<TmsLogisticsStatus>();
-            for (MetaHanaDeliverOrder deliver:deliverOrderListstatusNo
-                 ) {
-                if(plants !=null && plants.size()>0){
-                    if(plants.contains(deliver.getPlant())){
-                        continue;
-                    }
-                }
-                if(("未复核").equals(deliver.getReviewStatus())){
-                    List<String> tms = tmslistNo.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");
-                                tmslistNo.add(tmsLogisticsStatus);
-                               if(tmslistNo!=null && tmslistNo.size()>5000){
-                                   sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistNo);
-                                   tmslistNo.clear();
-                                   List<TmsLogisticsStatus> tmsNewLog=sysBatchSignForMapper.selectByDelivery();
-                                   if(tmsNewLog !=null && tmsNewLog.size()>0){
-                                       keytmsMap=tmsNewLog.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
-                                   }
-                               }
-                    }
-                }
-            }
-            if(tmslistNo !=null && tmslistNo.size()>0){
-                sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistNo);
-            }
+        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> deliverOrderListstatusYes=metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByYes();
-        if(deliverOrderListstatusYes !=null && deliverOrderListstatusYes.size()>0){
-            List<TmsLogisticsStatus> tmslistYes = new ArrayList<TmsLogisticsStatus>();
-            List<TmsLogisticsStatus> tmsStatus5list = new ArrayList<TmsLogisticsStatus>();
-            List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();
-            for (MetaHanaDeliverOrder deliver:deliverOrderListstatusYes
-            ) {
-                if(plants !=null && plants.size()>0){
-                    if(plants.contains(deliver.getPlant())){
-                        continue;
+        int count = metaHanaDeliverOrderMapper.selectCount();
+        int m = 10000;
+        int y = 0;
+        if (count % m != 0) {
+            y = count / m + 1;
+        }
+        int n = 0;
+        for (int x = 0; x <= y; x++) {
+            if (x == 0) {
+                n = 0;
+            } else {
+                n = n + 10000;
+            }
+            List<MetaHanaDeliverOrder> deliverOrderListstatusNo  = metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByNo(n, m);
+            if (deliverOrderListstatusNo != null && deliverOrderListstatusNo.size() > 0) {
+                List<TmsLogisticsStatus> tmslistNo = new ArrayList<TmsLogisticsStatus>();
+                List<TmsLogisticsStatus> tmslistYes = new ArrayList<TmsLogisticsStatus>();
+                List<TmsLogisticsStatus> tmsStatus5list = new ArrayList<TmsLogisticsStatus>();
+                List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();
+                for (MetaHanaDeliverOrder deliver : deliverOrderListstatusNo
+                ) {
+                    if (plants != null && plants.size() > 0) {
+                        if (plants.contains(deliver.getPlant())) {
+                            continue;
+                        }
                     }
-                }
-                if(("已复核").equals(deliver.getReviewStatus())){
-                    List<String> tms = tmslistYes.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();
+                    if (("未复核").equals(deliver.getReviewStatus())) {
+                        List<String> tms = tmslistNo.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");
+                            tmslistNo.add(tmsLogisticsStatus);
+                            if (tmslistNo != null && tmslistNo.size() > 5000) {
+                                sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistNo);
+                                tmslistNo.clear();
+                                List<TmsLogisticsStatus> tmsNewLog = sysBatchSignForMapper.selectByDelivery();
+                                if (tmsNewLog != null && tmsNewLog.size() > 0) {
+                                    keytmsMap = tmsNewLog.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
+                                }
+                            }
+                        }
+                    }else if(("已复核").equals(deliver.getReviewStatus())){
+                            List<String> tms = tmslistYes.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");
@@ -568,9 +566,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                 tmsLogisticsStatus.setIsDelete("0");
                                 tmsLogisticsStatus.setOrderCreationTime("");
                                 tmsLogisticsStatus.setDeliveryNumber(deliver.getDeliverNumber());
-                                if(("").equals(deliver.getShipmentNumber()) || deliver.getShipmentNumber()==null || ("null").equals(deliver.getShipmentNumber()) ){
+                                if (("").equals(deliver.getShipmentNumber()) || deliver.getShipmentNumber() == null || ("null").equals(deliver.getShipmentNumber())) {
                                     tmsLogisticsStatus.setTmsShipmentNumber(deliver.getDeliverNumber());
-                                }else{
+                                } else {
                                     tmsLogisticsStatus.setTmsShipmentNumber(deliver.getShipmentNumber());
                                 }
                                 tmsLogisticsStatus.setStatus("5");
@@ -581,7 +579,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                 tmsLogisticsStatus.setOrderNumber(deliver.getDocNumber());
                                 tmsLogisticsStatus.setAssignTime(new Date());
                                 tmsLogisticsStatus.setTransferOrder("n");
-                                String time=deliver.getPostingDate();
+                                String time = deliver.getPostingDate();
                                 Date date = new Date();
                                 try {
                                     date = new SimpleDateFormat("yyyyMMdd").parse(time);
@@ -589,92 +587,104 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                     //LOGGER.error("时间转换错误, string = {}", s, e);
                                 }
                                 tmsLogisticsStatus.setArrivalGoodsTime(date);
-                            tmslistYes.add(tmsLogisticsStatus);
-                            if(tmslistYes!=null && tmslistYes.size()>5000){
-                                sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistYes);
-                                tmslistYes.clear();
-                                List<TmsLogisticsStatus> tmsNewLog=sysBatchSignForMapper.selectByDelivery();
-                                if(tmsNewLog !=null && tmsNewLog.size()>0){
-                                    keytmsMap=tmsNewLog.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
+                                tmslistYes.add(tmsLogisticsStatus);
+                                if (tmslistYes != null && tmslistYes.size() > 5000) {
+                                    sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistYes);
+                                    tmslistYes.clear();
+                                    List<TmsLogisticsStatus> tmsNewLog = sysBatchSignForMapper.selectByDelivery();
+                                    if (tmsNewLog != null && tmsNewLog.size() > 0) {
+                                        keytmsMap = tmsNewLog.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
+                                    }
                                 }
                             }
-               } 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());
-                            if(tmsStatus5list!=null && tmsStatus5list.size()>5000){
-                                sysBatchSignForMapper.updateBatchTmsStatus(tmsStatus5list);
-                                tmsStatus5list.clear();
-                            }
-                        }
-                    }
-                    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());
-                            StringBuffer buffer=new StringBuffer();
-                            buffer.append(deliver.getDeliverNumber()).append(deliver.getDeliverItem());
-                            number.setCode(buffer.toString());
-                            if(("").equals(deliver.getShipmentNumber()) || deliver.getShipmentNumber()==null || ("null").equals(deliver.getShipmentNumber()) ){
-                                number.setShipmentNumber(deliver.getDeliverNumber());
-                            }else{
-                                number.setShipmentNumber(deliver.getShipmentNumber());
-                            }
-                            number.setDeliveryNumber(deliver.getDeliverNumber());
-                            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(deliverlist!=null && deliverlist.size()>5000){
-                                deliverQuantityConfirmMapper.saveDeliverNumber(deliverlist);
-                                deliverlist.clear();
-                                List<DeliverQuantityConfirm> delivernewNumber=deliverQuantityConfirmMapper.selectDeliverQuantityConfirmList(numbernull);
-                                if(delivernewNumber !=null && delivernewNumber.size()>0){
-                                    deliverNumbers = delivernewNumber.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
+                            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());
+                                        if (tmsStatus5list != null && tmsStatus5list.size() > 5000) {
+                                            sysBatchSignForMapper.updateBatchTmsStatus(tmsStatus5list);
+                                            tmsStatus5list.clear();
+                                        }
+                                    }
+                                }
+                                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());
+                                    StringBuffer buffer = new StringBuffer();
+                                    buffer.append(deliver.getDeliverNumber()).append(deliver.getDeliverItem());
+                                    number.setCode(buffer.toString());
+                                    if (("").equals(deliver.getShipmentNumber()) || deliver.getShipmentNumber() == null || ("null").equals(deliver.getShipmentNumber())) {
+                                        number.setShipmentNumber(deliver.getDeliverNumber());
+                                    } else {
+                                        number.setShipmentNumber(deliver.getShipmentNumber());
+                                    }
+                                    number.setDeliveryNumber(deliver.getDeliverNumber());
+                                    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 (deliverlist != null && deliverlist.size() > 5000) {
+                                        deliverQuantityConfirmMapper.saveDeliverNumber(deliverlist);
+                                        deliverlist.clear();
+                                        List<DeliverQuantityConfirm> delivernewNumber = deliverQuantityConfirmMapper.selectDeliverQuantityConfirmList(numbernull);
+                                        if (delivernewNumber != null && delivernewNumber.size() > 0) {
+                                            deliverNumbers = delivernewNumber.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
+                                        }
+                                    }
                                 }
                             }
+                        }
                     }
+                if (tmslistNo != null && tmslistNo.size() > 0) {
+                    sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistNo);
+                }
+                if (tmslistYes != null && tmslistYes.size() > 0) {
+                    sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistYes);
+                }
+                if (tmsStatus5list != null && tmsStatus5list.size() > 0) {
+                    sysBatchSignForMapper.updateBatchTmsStatus(tmsStatus5list);
+                }
+                if (deliverlist != null && deliverlist.size() > 0) {
+                    deliverQuantityConfirmMapper.saveDeliverNumber(deliverlist);
                 }
                 }
-            }
-            if(tmslistYes !=null && tmslistYes.size()>0){
-                sysBatchSignForMapper.saveTmsLogisticsStatus(tmslistYes);
-            }
-            if(tmsStatus5list !=null && tmsStatus5list.size()>0) {
-                sysBatchSignForMapper.updateBatchTmsStatus(tmsStatus5list);
-            }
-            if(deliverlist !=null && deliverlist.size()>0){
-                deliverQuantityConfirmMapper.saveDeliverNumber(deliverlist);
-            }
-        }
 
-    }
+           // List<MetaHanaDeliverOrder> deliverOrderListstatusYes = metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByYes(n,m);
+           // if (deliverOrderListstatusYes != null && deliverOrderListstatusYes.size() > 0) {
+             /*   List<TmsLogisticsStatus> tmslistYes = new ArrayList<TmsLogisticsStatus>();
+                List<TmsLogisticsStatus> tmsStatus5list = new ArrayList<TmsLogisticsStatus>();
+                List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();*/
+             /*   for (MetaHanaDeliverOrder deliver : deliverOrderListstatusYes
+                ) {*/
 
+        }
+    }
     public Set<String> getConfigValueSet(String dictType){
             Set<String> res = new HashSet<>();
             List<SysDictData> dictDatas = sysDictDataService.selectSimpleDictDataByType(dictType);

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

@@ -44,58 +44,63 @@
             <result property="code"    column="code"    />
         </resultMap>
 
+        <select id="selectCount" resultType="int">
+            SELECT
+                count(0)
+            FROM
+                meta_hana_deliver_order
+        </select>
 
-
-    <select id="selectMetaDeliverOrderListByNo" parameterType="MetaHanaDeliverOrder" resultMap="MetaHanaDeliverOrderResult"   >
+    <select id="selectMetaDeliverOrderListByNo" resultType="com.dgtly.system.domain.MetaHanaDeliverOrder"  >
         SELECT
-            ( m.DELIVER_NUMBER+m.DELIVER_ITEM) as code,
-            m.DELIVER_NUMBER ,
-            m.DELIVER_ITEM ,
-            m.DOC_NUMBER ,
-            m.DOC_ITEM ,
-            m.CREATE_DATE_DOC ,
-            m.CUSTOMER_CODE ,
-            m.CUSTOMER_NAME ,
+            concat(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 ,
-            m.MATERIAL_CODE ,
-            m.MATERIAL_NAME ,
-            m.SIZE_DIM ,
-            m.SHIPMENT_NUMBER ,
-            m.SHIP_TO_ADDRESS ,
-            m.REVIEW_STATUS ,
-            m.DELIVER_WT ,
-            m.DELIVER_QTY ,
-            m.NET_VALUE ,
-            m.POSTING_DATE
+            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.REVIEW_STATUS='未复核'
+            meta_hana_deliver_order m   ORDER BY POSTING_DATE asc limit ${pageNo},${pageSize}
 
     </select>
-    <select id="selectMetaDeliverOrderListByYes" parameterType="MetaHanaDeliverOrder" resultMap="MetaHanaDeliverOrderResult"   >
+    <select id="selectMetaDeliverOrderListByYes" resultType="com.dgtly.system.domain.MetaHanaDeliverOrder"  >
         SELECT
-            ( m.DELIVER_NUMBER+m.DELIVER_ITEM) as code,
-            m.DELIVER_NUMBER ,
-            m.DELIVER_ITEM ,
-            m.DOC_NUMBER ,
-            m.DOC_ITEM ,
-            m.CREATE_DATE_DOC ,
-            m.CUSTOMER_CODE ,
-            m.CUSTOMER_NAME ,
+            concat(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 ,
-            m.MATERIAL_CODE ,
-            m.MATERIAL_NAME ,
-            m.SIZE_DIM ,
-            m.SHIPMENT_NUMBER ,
-            m.SHIP_TO_ADDRESS ,
-            m.REVIEW_STATUS ,
-            m.DELIVER_WT ,
-            m.DELIVER_QTY ,
-            m.NET_VALUE ,
-            m.POSTING_DATE
+            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.REVIEW_STATUS='已复核'
+            meta_hana_deliver_order m  where  m.REVIEW_STATUS='已复核' ORDER BY POSTING_DATE asc limit ${pageNo},${pageSize}
 
     </select>