1

src/main/java/com/heai/modules/app/service/impl/WareHouseServiceImpl.java

@@ -147,6 +147,19 @@ public class WareHouseServiceImpl implements WareHouseService {
             inTransDetail.setFreight(0.0);
             inTransDetail.setDuty(0.0);
             inTransDetail.setTransQty2(0.0);
+            InventoryStockInVo stockQuery = new InventoryStockInVo();
+            stockQuery.setSite(site);
+            stockQuery.setWarehouseID(inList.get(i).getWarehouseId());
+            stockQuery.setPartNo(inList.get(i).getPartNo());
+            stockQuery.setBatchNo(inList.get(i).getBatchNo());
+            stockQuery.setLocationID(inList.get(i).getLocationId());
+            InventoryStockInVo stockRow = wareHouseDao.getStockData(stockQuery);
+            if (stockRow != null) {
+                outTransDetail.setManufactureDate(stockRow.getManufactureDate());
+                outTransDetail.setExpiredDate(stockRow.getExpiredDate());
+                inTransDetail.setManufactureDate(stockRow.getManufactureDate());
+                inTransDetail.setExpiredDate(stockRow.getExpiredDate());
+            }
             wareHouseDao.saveTransDetail(outTransDetail);
             wareHouseDao.saveTransDetail(inTransDetail);
             ProductionWarehouseData productionWarehouseData=new ProductionWarehouseData();
@@ -274,6 +287,19 @@ public class WareHouseServiceImpl implements WareHouseService {
             inTransDetail.setFreight(0.0);
             inTransDetail.setDuty(0.0);
             inTransDetail.setTransQty2(0.0);
+            InventoryStockInVo stockQuery = new InventoryStockInVo();
+            stockQuery.setSite(site);
+            stockQuery.setWarehouseID(inList.get(i).getWarehouseId());
+            stockQuery.setPartNo(inList.get(i).getPartNo());
+            stockQuery.setBatchNo(inList.get(i).getBatchNo());
+            stockQuery.setLocationID(inList.get(i).getLocationId());
+            InventoryStockInVo stockRow = wareHouseDao.getStockData(stockQuery);
+            if (stockRow != null) {
+                outTransDetail.setManufactureDate(stockRow.getManufactureDate());
+                outTransDetail.setExpiredDate(stockRow.getExpiredDate());
+                inTransDetail.setManufactureDate(stockRow.getManufactureDate());
+                inTransDetail.setExpiredDate(stockRow.getExpiredDate());
+            }
             wareHouseDao.saveTransDetail(outTransDetail);
             wareHouseDao.saveTransDetail(inTransDetail);
             ProductionWarehouseData productionWarehouseData=new ProductionWarehouseData();

src/main/resources/mapper/taskmanage/TaskDatailDao.xml

@@ -216,6 +216,8 @@
     </select>
 
     <select id="queryPartInventory" resultType="com.heai.modules.board.entity.Inventory">
+        select *
+        from (
         Select  T.Site,
                 T.PartNo,
                 P.PartDescription,
@@ -307,6 +309,9 @@
                 T.BatchNo,
             </if>
             P.Site
+
+        ) X
+        ORDER BY ISNULL(ManufactureDate,FirstInDate)
     </select>
 
 </mapper>