|
|
@ -479,7 +479,8 @@ public class WorkOrderController {
|
|
|
|
warehousingStorageProductModel.setDepartmentId( entity.getDepartmentId());
|
|
|
|
warehousingStorageProductModel.setDepartmentId( entity.getDepartmentId());
|
|
|
|
warehousingStorageProductModel.setCreatorUserId( entity.getCreatorUserId());
|
|
|
|
warehousingStorageProductModel.setCreatorUserId( entity.getCreatorUserId());
|
|
|
|
//入库新增一个批次号
|
|
|
|
//入库新增一个批次号
|
|
|
|
warehousingStorageProductModel.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false));
|
|
|
|
// warehousingStorageProductModel.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false));
|
|
|
|
|
|
|
|
warehousingStorageProductModel.setBatchNumber(workOrderProductModel.getBatchNumber()); //成品批次
|
|
|
|
list.add(warehousingStorageProductModel);
|
|
|
|
list.add(warehousingStorageProductModel);
|
|
|
|
warehousingStorageForm.setWarehousingStorageProductList(list);
|
|
|
|
warehousingStorageForm.setWarehousingStorageProductList(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -513,7 +514,8 @@ public class WorkOrderController {
|
|
|
|
inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId());
|
|
|
|
inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId());
|
|
|
|
inventoryEntity.setWarehouseId(entity.getWarehouseId());
|
|
|
|
inventoryEntity.setWarehouseId(entity.getWarehouseId());
|
|
|
|
inventoryEntity.setStorageAreaId(warehousingStorageProductModel.getStorageAreaId());
|
|
|
|
inventoryEntity.setStorageAreaId(warehousingStorageProductModel.getStorageAreaId());
|
|
|
|
inventoryEntity.setBatchNumber(warehousingStorageProductModel.getBatchNumber());
|
|
|
|
// inventoryEntity.setBatchNumber(warehousingStorageProductModel.getBatchNumber());
|
|
|
|
|
|
|
|
inventoryEntity.setBatchNumber(workOrderForm.getWorkOrderProductList().get(0).getBatchNumber()); //成品批次
|
|
|
|
|
|
|
|
|
|
|
|
inventoryEntity.setCompanyId( entity.getCompanyId());
|
|
|
|
inventoryEntity.setCompanyId( entity.getCompanyId());
|
|
|
|
inventoryEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
|
|
|
|
inventoryEntity.setOrganizeJsonId(entity.getOrganizeJsonId());
|
|
|
|