1.隔口移转中 每个隔口的料盘 取最早的时间

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -418,6 +418,10 @@ public class Barcode extends BasePo implements Serializable {
 
 
     }
     }
 
 
+    public void setPutInTime(Date date){
+        this.putInTime = date.getTime();
+    }
+
     public void setPutInTime(long putInTime,boolean needUpdateTime) {
     public void setPutInTime(long putInTime,boolean needUpdateTime) {
         this.putInTime = putInTime;
         this.putInTime = putInTime;
         this.putInDate = new Date(putInTime);
         this.putInDate = new Date(putInTime);

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualStorTransferController.java

@@ -32,10 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.swing.*;
 import javax.swing.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
 
 @Slf4j
 @Slf4j
 @ApiOperation("手动储位移转")
 @ApiOperation("手动储位移转")
@@ -177,7 +174,7 @@ public class ManualStorTransferController {
                 }
                 }
 
 
                 //获取最早的创建时间(转库的时候,每次转移的料盘,取当前隔口的最早创建时间)
                 //获取最早的创建时间(转库的时候,每次转移的料盘,取当前隔口的最早创建时间)
-                Date createDate = BoxHandleUtil.getCreateDate(boxBarcode, newPartition);
+                Date createDate = BoxHandleUtil.getCreateDate(boxBarcode, newPartition,barcode.getCreateDate());
                 if (barcode.getCreateDate() == null){
                 if (barcode.getCreateDate() == null){
                     barcode.setCreateDate(createDate);
                     barcode.setCreateDate(createDate);
                 }
                 }
@@ -194,6 +191,16 @@ public class ManualStorTransferController {
                 generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name(), "");
                 generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name(), "");
                 boxBarcode.updateSubCodes(barcode);
                 boxBarcode.updateSubCodes(barcode);
                 boxBarcode.setAmount(boxBarcode.getAmount() + barcode.getAmount());
                 boxBarcode.setAmount(boxBarcode.getAmount() + barcode.getAmount());
+
+                //同时修改当前入库时间
+                for (Barcode subCode : boxBarcode.getSubCodeList()) {
+                    if (newPartition.equals(subCode.getPosName())){
+                        subCode.setPutInTime(createDate);
+                        subCode.setCreateDate(createDate);
+                        barcodeManager.save(subCode);
+                    }
+                }
+
                 barcodeManager.save(boxBarcode);
                 barcodeManager.save(boxBarcode);
                 if (inPos != null) {
                 if (inPos != null) {
                     //流程异常时,为保证数据一致性, pos中的box barcode也需要更新
                     //流程异常时,为保证数据一致性, pos中的box barcode也需要更新

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BoxHandleUtil.java

@@ -633,9 +633,9 @@ public class BoxHandleUtil {
     }
     }
 
 
 
 
-    public static Date getCreateDate(Barcode boxBarcode, String binCode) {
+    public static Date getCreateDate(Barcode boxBarcode, String binCode,Date createDate) {
 
 
-        Date createDate = new Date();
+        //Date createDate = new Date();
         List<Barcode> subCodeList = boxBarcode.getSubCodeList();
         List<Barcode> subCodeList = boxBarcode.getSubCodeList();
         if (subCodeList != null && !subCodeList.isEmpty()) {
         if (subCodeList != null && !subCodeList.isEmpty()) {
             for (Barcode barcode : subCodeList) {
             for (Barcode barcode : subCodeList) {