Merge remote-tracking branch 'origin/master_hella' into master_hella

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRequest/ContainerMainRequestServiceImpl.java

@@ -30,6 +30,7 @@ import com.win.module.wms.dal.dataobject.containerRecord.ContainerRecordMainDO;
 import com.win.module.wms.dal.dataobject.containerRequest.ContainerDetailRequestDO;
 import com.win.module.wms.dal.dataobject.containerRequest.ContainerMainRequestDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
+import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
@@ -56,6 +57,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import javax.validation.Validator;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -387,6 +389,11 @@ public class ContainerMainRequestServiceImpl implements ContainerMainRequestServ
                 transactionCreateReqVOOut.setAreaType(areabasicDO.getType());
                 transactionCreateReqVOOut.setPackUnit(jobUtils.getItemareaDO(transactionCreateReqVOOut.getItemCode(), areabasicDO.getCode()).getInPackUnit());
                 transactionCreateReqVOOut.setPackQty(jobUtils.getItempackageDO(transactionCreateReqVOOut.getItemCode(), transactionCreateReqVOOut.getPackUnit()).getPackQty());
+                LocationDO locationDO = locationService.queryByCode(transactionCreateReqVOOut.getLocationCode());
+                transactionCreateReqVOOut.setLocationGroupCode(locationDO.getLocationGroupCode());
+                transactionCreateReqVOOut.setWarehouseCode(locationDO.getWarehouseCode());
+                transactionCreateReqVOOut.setArriveDate(LocalDateTime.now());
+                transactionCreateReqVOOut.setProduceDate(LocalDateTime.now());
                 transactionCreateReqVOList.add(transactionCreateReqVOOut);
             }
             if (!"InitialContainerManage".equals(containerRecordMainDO.getBusinessType())) {
@@ -412,6 +419,11 @@ public class ContainerMainRequestServiceImpl implements ContainerMainRequestServ
                     transactionCreateReqVOIn.setAreaType(areabasicDO.getType());
                     transactionCreateReqVOIn.setPackUnit(jobUtils.getItemareaDO(transactionCreateReqVOIn.getItemCode(), areabasicDO.getCode()).getInPackUnit());
                     transactionCreateReqVOIn.setPackQty(jobUtils.getItempackageDO(transactionCreateReqVOIn.getItemCode(), transactionCreateReqVOIn.getPackUnit()).getPackQty());
+                    LocationDO locationDO = locationService.queryByCode(transactionCreateReqVOIn.getLocationCode());
+                    transactionCreateReqVOIn.setLocationGroupCode(locationDO.getLocationGroupCode());
+                    transactionCreateReqVOIn.setWarehouseCode(locationDO.getWarehouseCode());
+                    transactionCreateReqVOIn.setArriveDate(LocalDateTime.now());
+                    transactionCreateReqVOIn.setProduceDate(LocalDateTime.now());
                     transactionCreateReqVOList.add(transactionCreateReqVOIn);
                 }
             }