收款

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranTaskInfo.java

@@ -170,6 +170,8 @@ public class TranTaskInfo extends BaseModel<TranTaskInfo> {
 
     @TableField(exist = false)
     private List<TranCarInfo> tranCarInfoList;
+    @TableField(exist = false)
+    private TranProcessInfo tranProcessInfo;
     /**
      *包括已删除的调度
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockSaleReceiptReportServiceImpl.java

@@ -47,7 +47,12 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
     private IWarehouseInOutInfoService warehouseInOutInfoService;
     @Autowired
     private IContractGoodsInfoService contractGoodsInfoService;
-
+    @Autowired
+    private ITranTaskInfoService tranTaskInfoService;
+    @Autowired
+    private ITranProcessInfoService tranProcessInfoService;
+    @Autowired
+    private ITranCarInfoService tranCarInfoService;
     /**
      * 销售出库统计
      *
@@ -59,16 +64,16 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("startRecord", (stockSaleReceiptReport.getCurrentPage() - 1)
                 * stockSaleReceiptReport.getPageSize());
-        List<String> businessKeys = null;
-        if ("1".equals(stockSaleReceiptReport.getSearchType())) {
-            businessKeys = workflowService.getTaskBusinessKeysByCode("SALE-RECEIPT-REPORT");
-        }
-        List<String> statusSet = new ArrayList<>();
-        List<String> resourceIdList = this.getResourceIdList();
-        if (resourceIdList.contains("procurementStockInReport-Edit")) { // 填写，提交    权限做完以后替换
-            List<String> statusList = Lists.newArrayList(StatusEnum.PUR_RETURN.getFlag());
-            statusSet.addAll(statusList);
-        }
+//        List<String> businessKeys = null;
+//        if ("1".equals(stockSaleReceiptReport.getSearchType())) {
+//            businessKeys = workflowService.getTaskBusinessKeysByCode("SALE-RECEIPT-REPORT");
+//        }
+//        List<String> statusSet = new ArrayList<>();
+//        List<String> resourceIdList = this.getResourceIdList();
+//        if (resourceIdList.contains("procurementStockInReport-Edit")) { // 填写，提交    权限做完以后替换
+//            List<String> statusList = Lists.newArrayList(StatusEnum.PUR_RETURN.getFlag());
+//            statusSet.addAll(statusList);
+//        }
         //公司id
         pageView.put("compId", stockSaleReceiptReport.getCompId());
         pageView.put("searchKeyWord", stockSaleReceiptReport.getSearchKeyWord());
@@ -76,9 +81,10 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
         pageView.put("pageSize", stockSaleReceiptReport.getPageSize());
         pageView.put("currentPage", stockSaleReceiptReport.getCurrentPage());
         pageView.put("contractNo", stockSaleReceiptReport.getContractNo());
+        pageView.put("processNo", stockSaleReceiptReport.getProcessNo());
         pageView.put("statusFlag", stockSaleReceiptReport.getStatusFlag());
-        pageView.put("businessKeys", businessKeys);
-        pageView.put("statusSet", statusSet);
+//        pageView.put("businessKeys", businessKeys);
+//        pageView.put("statusSet", statusSet);
         // 查询销售出库总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<StockSaleReceiptReport> dataList = baseMapper.getListByCondition(pageView);
@@ -91,13 +97,13 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                 if (warehouseInOutInfo!=null){
                     saleReceiptReport1.setPoundImg(warehouseInOutInfo.getAddressUrl());
                 }
-                String taskId = "";
-                // 只有待审核状态才有taskId
-                if (StringUtils.isNotBlank(saleReceiptReport1.getWorkflowId())) {
-                    JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(saleReceiptReport1.getWorkflowId()), saleReceiptReport1.getId());
-                    taskId = jsonObject.getString("taskId");
-                    saleReceiptReport1.setTaskId(taskId);
-                }
+//                String taskId = "";
+//                // 只有待审核状态才有taskId
+//                if (StringUtils.isNotBlank(saleReceiptReport1.getWorkflowId())) {
+//                    JSONObject jsonObject = workflowService.getActiveTask(Lists.newArrayList(saleReceiptReport1.getWorkflowId()), saleReceiptReport1.getId());
+//                    taskId = jsonObject.getString("taskId");
+//                    saleReceiptReport1.setTaskId(taskId);
+//                }
             }
         }
         Page<StockSaleReceiptReport> page = new Page<>();
@@ -171,29 +177,37 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
     public String collectMoney(StockSaleReceiptReport stockSaleReceiptReport) {
         List<StockSaleReceiptReport> stockSaleReceiptReportList = stockSaleReceiptReport.getStockSaleReceiptReportList();
         if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
-                StockSaleReceiptReport stockSaleReceiptReport1=stockSaleReceiptReportList.get(0);
-                StockSaleReceiptReport stockSaleReceiptReport2 = this.selectById(stockSaleReceiptReport1.getId());
-                stockSaleReceiptReport1.setCollectionDate(stockSaleReceiptReport.getCollectionDate());
-                stockSaleReceiptReport1.setCollectionScreenshot(stockSaleReceiptReport2.getCollectionScreenshot() != null ? stockSaleReceiptReport2.getCollectionScreenshot() + '$' + stockSaleReceiptReport.getCollectionScreenshot() : stockSaleReceiptReport.getCollectionScreenshot());
-                stockSaleReceiptReport1.setAmountEdReceivable(stockSaleReceiptReport2.getAmountEdReceivable() + stockSaleReceiptReport.getMoney());
-                if (stockSaleReceiptReport1.getAmountNotReceivable()>=stockSaleReceiptReport.getMoney()) {
-                    stockSaleReceiptReport1.setAmountNotReceivable(stockSaleReceiptReport2.getAmountIngReceivable() - stockSaleReceiptReport1.getAmountEdReceivable());
-                }
-                else{
-                    Float money=stockSaleReceiptReport.getMoney()-stockSaleReceiptReport1.getAmountNotReceivable();
-                    stockSaleReceiptReport1.setAmountNotReceivable(0.0f);
-                    for (StockSaleReceiptReport stockSaleReceiptReport3 : stockSaleReceiptReportList) {
-                        if (stockSaleReceiptReport3.getAmountNotReceivable()>=money){
-                            stockSaleReceiptReport3.setAmountNotReceivable(stockSaleReceiptReport3.getAmountNotReceivable() - money);
-                        }
-                        else {
-                            money=money-stockSaleReceiptReport3.getAmountNotReceivable();
-                            stockSaleReceiptReport3.setAmountNotReceivable(0.0f);
-                        }
-                        this.updateById(stockSaleReceiptReport3);
+            StockSaleReceiptReport stockSaleReceiptReport1=stockSaleReceiptReportList.get(0);
+            StockSaleReceiptReport stockSaleReceiptReport2 = this.selectById(stockSaleReceiptReport1.getId());
+            stockSaleReceiptReport1.setCollectionDate(stockSaleReceiptReport.getCollectionDate());
+            stockSaleReceiptReport1.setCollectionScreenshot(stockSaleReceiptReport2.getCollectionScreenshot() != null ? stockSaleReceiptReport2.getCollectionScreenshot() + '$' + stockSaleReceiptReport.getCollectionScreenshot() : stockSaleReceiptReport.getCollectionScreenshot());
+            stockSaleReceiptReport1.setAmountEdReceivable(stockSaleReceiptReport2.getAmountEdReceivable() + stockSaleReceiptReport.getMoney());
+            if (stockSaleReceiptReport1.getAmountNotReceivable()>=stockSaleReceiptReport.getMoney()) {
+                stockSaleReceiptReport1.setAmountNotReceivable(stockSaleReceiptReport2.getAmountIngReceivable() - stockSaleReceiptReport1.getAmountEdReceivable());
+                stockSaleReceiptReport1.setStatusFlag(StatusEnum.PUR_COLLECT.getFlag());
+                stockSaleReceiptReport1.setStatus(StatusEnum.PUR_COLLECT.getName());
+            }
+            else{
+                Float money=stockSaleReceiptReport.getMoney()-stockSaleReceiptReport1.getAmountNotReceivable();
+                stockSaleReceiptReport1.setAmountNotReceivable(0.0f);
+                stockSaleReceiptReport1.setStatusFlag(StatusEnum.PUR_COLLECTaLL.getFlag());
+                stockSaleReceiptReport1.setStatus(StatusEnum.PUR_COLLECTaLL.getName());
+                for (StockSaleReceiptReport stockSaleReceiptReport3 : stockSaleReceiptReportList) {
+                    if (stockSaleReceiptReport3.getAmountNotReceivable()>=money){
+                        stockSaleReceiptReport3.setAmountNotReceivable(stockSaleReceiptReport3.getAmountNotReceivable() - money);
+                        stockSaleReceiptReport3.setStatusFlag(StatusEnum.PUR_COLLECT.getFlag());
+                        stockSaleReceiptReport3.setStatus(StatusEnum.PUR_COLLECT.getName());
+                    }
+                    else {
+                        money=money-stockSaleReceiptReport3.getAmountNotReceivable();
+                        stockSaleReceiptReport3.setAmountNotReceivable(0.0f);
+                        stockSaleReceiptReport3.setStatusFlag(StatusEnum.PUR_COLLECTaLL.getFlag());
+                        stockSaleReceiptReport3.setStatus(StatusEnum.PUR_COLLECTaLL.getName());
                     }
+                    this.updateById(stockSaleReceiptReport3);
                 }
-                this.updateById(stockSaleReceiptReport1);
+            }
+            this.updateById(stockSaleReceiptReport1);
         }
         return "ok";
     }
@@ -213,6 +227,32 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                 .eq("goods_type","1")
                 .orderBy("update_date", false));
         for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
+            List<TranTaskInfo> tranTaskInfoList=tranTaskInfoService.selectList(new EntityWrapper<TranTaskInfo>()
+                .eq("comp_id",contractManagementInfo.getCompId())
+                .eq("contract_no",contractManagementInfo.getContractNo()));
+            if (!CollectionUtils.isEmpty(tranTaskInfoList)){
+                for(TranTaskInfo tranTaskInfo:tranTaskInfoList){
+                    TranProcessInfo tranProcessInfo=tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
+                            .eq("info_id",tranTaskInfo.getId())
+                            .eq("end_flag","1"));
+                    if (tranProcessInfo!=null){
+                        TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                .eq("process_id",tranProcessInfo.getId())
+                                .eq("ship_type","集装箱"));
+                        if (tranCarInfo!=null){
+                            tranProcessInfo.setTranType("箱船");
+                        }
+                        TranCarInfo tranCarInfo1=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                .eq("process_id",tranProcessInfo.getId())
+                                .eq("ship_type","散船"));
+                        if (tranCarInfo1!=null){
+                            tranProcessInfo.setTranType("散船");
+                        }
+                        tranTaskInfo.setTranProcessInfo(tranProcessInfo);
+                    }
+                }
+                contractManagementInfo.setTranTaskInfoList(tranTaskInfoList);
+            }
             ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                     .eq("contract_id",contractManagementInfo.getId()));
             contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/StockSaleReceiptReportMapper.xml

@@ -20,6 +20,9 @@
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
+        <if test="processNo != null and processNo != ''">
+            AND process_no = #{processNo}
+        </if>
         <if test="businessKeys != null and businessKeys.size > 0">
             and(
             <foreach collection="businessKeys" item="businessValue" open="(" close=")" separator="or">
@@ -72,6 +75,9 @@
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
+        <if test="processNo != null and processNo != ''">
+            AND process_no = #{processNo}
+        </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND amount_ing_receivable-amount_ed_receivable>0