合同编号

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

@@ -194,7 +194,7 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
     /**
      * 计算应收
      */
-    private Float calculationCollectionable;
+    private Float calculationCollectable;
     /**
      * 实际付款
      */

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

@@ -593,9 +593,6 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .orderBy("update_date", false));
 
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
-                ContractGoodsInfo contractGoodsInfo=contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
-                .eq("contract_id",contractManagementInfo.getId()));
-                contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
                 temp.add(contractManagementInfo);
             }
             return temp;
@@ -607,7 +604,6 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("contract_type", "2")
                     .eq("delete_flag", "0")
                     .orderBy("update_date", false));
-
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 temp.add(contractManagementInfo);
             }
@@ -646,16 +642,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                             }
                         }
                     }
-//                    if(!CollectionUtils.isEmpty(contractManagementInfoList)) {
-//                        temp.add(contractManagementInfoList.get(i));
-//
-//                    }
                 }
                 temp.addAll(contractManagementInfoList);
             }
             return temp;
         }
-        //查销售合同编号
+        //查销售订单审核合同编号
         else if (flag == 4) {
             List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
                     .eq("comp_id", compId)
@@ -675,16 +667,40 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                             }
                         }
                     }
-//                    if(!CollectionUtils.isEmpty(contractManagementInfoList)) {
-//                        temp.add(contractManagementInfoList.get(i));
-//                    }
                 }
                 temp.addAll(contractManagementInfoList);
             }
             return temp;
         }
+        //查销售合同编号,以及移库任务编号
+        else if(flag == 5){
+            List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
+                    .eq("comp_id", compId)
+                    .eq("delete_flag", "0")
+                    .eq("contract_type", "1")
+                    .orderBy("update_date", false));
+            for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
+                ContractGoodsInfo contractGoodsInfo=contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
+                        .eq("contract_id",contractManagementInfo.getId()));
+                contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
+                temp.add(contractManagementInfo);
+            }
+            List<InOutWarehouseTask> inOutWarehouseTaskList = iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+                    .eq("comp_id", compId)
+                    .eq("delete_flag", "0")
+                    .eq("task_type_key", "3")
+                    .eq("in_out_flag", "1")
+                    .orderBy("update_date", false));
+            for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
+                ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
+                BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
+                contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
+                temp.add(contractManagementInfo);
+            }
+            return temp;
+        }
         //查采购、销售合同编号,以及移库任务编号
-        else {
+        else{
             List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
                     .eq("comp_id", compId)
                     .eq("delete_flag", "0")