|
|
@@ -1313,7 +1313,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
List<ContractManagementInfo> contractManagementInfoList1 = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("status_flag", "1")
|
|
|
- .eq("contract_type", "2")
|
|
|
+ .eq("contract_type", "1")
|
|
|
.eq("delete_flag", "0")
|
|
|
.orderBy("update_date", false));
|
|
|
for (ContractManagementInfo contractManagementInfo1 : contractManagementInfoList1) {
|
|
|
@@ -1345,7 +1345,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
contractManagementInfo1.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
contractManagementInfo1.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
contractManagementInfo1.setGrade(contractGoodsInfo.getGrade());
|
|
|
- contractManagementInfo1.setInOutType("采购入库");
|
|
|
+ contractManagementInfo1.setInOutType("退库");
|
|
|
temp.add(contractManagementInfo1);
|
|
|
}
|
|
|
List<InOutWarehouseTask> inOutWarehouseTaskList = iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
|
|
|
@@ -1356,7 +1356,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.orderBy("update_date", false));
|
|
|
for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
|
|
|
ContractManagementInfo contractManagementInfo1 = new ContractManagementInfo();
|
|
|
- BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
|
|
|
+ BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo1);
|
|
|
//查移库任务编号下的车牌号,入库只能查到已出库的
|
|
|
List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
.eq("contract_no", inOutWarehouseTask.getMoveTaskNo()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "1")
|
