Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/IDistributionBusinessPreOrderServiceImpl.java

@@ -205,6 +205,8 @@ public class IDistributionBusinessPreOrderServiceImpl extends BaseServiceImpl<Di
 		queryWrapper.eq(DistributionBusinessPreOrderEntity::getInWarehouse, 1);
 		Long l = baseMapper.selectCount(queryWrapper);
 
+
+
 		return Resp.scanSuccess("扫描成功", l + "件");
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java

@@ -129,7 +129,7 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 	@Override
 	public void extracted(String status, String unitNo, String currentWarehouseId, String operationTime, Integer trayId) {
 		log.info("#############extracted: 当前处理的数据为 status={} unitNo={} currentWarehouseId={} operationTime={} trayId={}",status,unitNo,currentWarehouseId,operationTime,trayId);
-		if ("4".equals(status) || "2".equals(status)) {
+		if ("4".equals(status) || "2".equals(status) || "1".equals(status)) {
 			//继续判断是否到达目的仓
 
 			//查询destinationWarehouse logiBillNo plantId数据

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -377,7 +377,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 					upShelfStockDTO.setAllocationId(warehousingDetail.getAllocationId());
 					upShelfStockDTO.setIncomingBatch(entity.getIncomingBatch());
 					upShelfStockDTO.setMaterialName(entity.getDescriptionGoods());
-					upShelfStockDTO.setNum(num);
+					upShelfStockDTO.setEnterNum(num);
 					upShelfStockDTO.setWarehouseId(entity.getWarehouseId());
 					list.add(upShelfStockDTO);
 					warehouseUpdownTypeService.upShelfStockList(list,warehousingDetail.getAllocationId(),entity.getWarehouseId(),"入库单录入数量上架至"+warehousingDetail.getAllocationName()+num+"件");