|
|
@@ -956,6 +956,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
//查销售合同编号,以及移库任务编号
|
|
|
else if (flag == 5) {
|
|
|
+ calendar = Calendar.getInstance();
|
|
|
+ calendar.add(Calendar.MONTH, -1);
|
|
|
List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("delete_flag", "0")
|
|
|
@@ -1012,6 +1014,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("delete_flag", "0")
|
|
|
.eq("task_type_key", "3")
|
|
|
+ .eq("task_status_key", "5")
|
|
|
.eq("in_out_flag", "1")
|
|
|
.ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
|
|
|
.orderBy("update_date", false));
|
|
|
@@ -1074,6 +1077,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
//查采购合同编号(不包含自运）,以及移库任务编号
|
|
|
else if (flag == 6) {
|
|
|
+ calendar = Calendar.getInstance();
|
|
|
+ calendar.add(Calendar.MONTH, -1);
|
|
|
List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("delete_flag", "0")
|
|
|
@@ -1104,6 +1109,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("delete_flag", "0")
|
|
|
.eq("task_type_key", "3")
|
|
|
+ .eq("task_status_key", "5")
|
|
|
.eq("in_out_flag", "1")
|
|
|
.orderBy("update_date", false));
|
|
|
for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
|
|
|
@@ -1283,6 +1289,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("delete_flag", "0")
|
|
|
.eq("task_type_key", "3")
|
|
|
+ .eq("task_status_key", "5")
|
|
|
.eq("in_out_flag", "1")
|
|
|
.ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
|
|
|
.orderBy("update_date", false));
|
|
|
@@ -1378,6 +1385,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
//一个收购合同只能选一次
|
|
|
InOutWarehouseTask inOutWarehouseTask = iInOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
|
|
|
.eq("comp_id", contractManagementInfo.getCompId())
|
|
|
+ .eq("task_status_key", "5")
|
|
|
.eq("contract_no", contractManagementInfo.getContractNo())
|
|
|
.eq("delete_flag", "0")
|
|
|
.orderBy("update_date", false));
|
|
|
@@ -1446,6 +1454,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
List<InOutWarehouseTask> inOutWarehouseTaskList = iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("delete_flag", "0")
|
|
|
+ .eq("task_status_key", "5")
|
|
|
.eq("task_type_key", "3")
|
|
|
.eq("in_out_flag", "1")
|
|
|
.orderBy("update_date", false));
|
