|
@@ -28,6 +28,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseNumView;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.exception.YException;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper;
|
|
|
+import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
|
|
|
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
|
|
@@ -61,6 +62,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
|
|
|
@Autowired
|
|
|
private IWarehouseInOutInfoService warehouseInOutInfoService;
|
|
|
@Autowired
|
|
|
+ private IContractManagementInfoService contractManagementInfoService;
|
|
|
+ @Autowired
|
|
|
private INoticeService noticeService;
|
|
|
@Autowired
|
|
|
private INoticeTaskService noticeTaskService;
|
|
@@ -553,4 +556,35 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
|
|
|
}
|
|
|
return inOutWarehouseTaskList;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param compId,warehouseName
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public InOutWarehouseTask getContractNo(String compId,String warehouseName){
|
|
|
+ InOutWarehouseTask inOutWarehouseTask = new InOutWarehouseTask();
|
|
|
+ List<InOutWarehouseTask> stringList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
|
|
|
+ .eq("comp_id",compId)
|
|
|
+ .eq("receive_warehouse",warehouseName)
|
|
|
+ .eq("task_status_key","5")
|
|
|
+ .eq("in_out_type_key","3")
|
|
|
+ .eq("delete_flag","0"));
|
|
|
+ if(CollectionUtils.isNotEmpty(stringList)){
|
|
|
+ List<ContractManagementInfo> contractManagementInfoList=new ArrayList<>();
|
|
|
+ for(InOutWarehouseTask inOutWarehouseTask1 : stringList){
|
|
|
+ ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
|
|
|
+ .eq("contract_no",inOutWarehouseTask1.getMoveTaskNo())
|
|
|
+ .eq("deliver_type","3")
|
|
|
+ .eq("delete_flag", "0")
|
|
|
+ );
|
|
|
+ if (contractManagementInfo!=null){
|
|
|
+ contractManagementInfoList.add(contractManagementInfo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ inOutWarehouseTask.setContractManagementInfoList(contractManagementInfoList);
|
|
|
+ }
|
|
|
+ return inOutWarehouseTask;
|
|
|
+ }
|
|
|
}
|