5.29问题修改

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml

@@ -841,13 +841,7 @@
                 WHEN '7' THEN
                     '现汇'
                 END AS PAY_MTH,
-            CASE
+                g.yunguan_value AS TRANS_TYPE
-                a.fix_price_mode
-                WHEN '1' THEN
-                    '锁价模式'
-                WHEN '2' THEN
-                    '后结算模式'
-                END AS TRANS_TYPE
         FROM
             jg_business_order a
                 LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id
@@ -860,6 +854,8 @@
                 AND e.f_delete_mark IS NULL
                 LEFT JOIN jg_contract f ON a.contract_id = f.id
                 AND f.f_delete_mark IS NULL
+                LEFT JOIN jg_dictionary_yunguan_data g ON a.fix_price_mode = g.zhihui_value
+                AND g.f_delete_mark IS NULL AND g.type_id = '565504934695425285'
             WHERE a.f_delete_mark is null and a.id = #{id}
     </select>
 

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java

@@ -1100,24 +1100,34 @@ public class BusinessOrderController {
             }
             contractList.addAll(list);
         }else {
-            list = businessOrderService.querySaleContractInfo(businessOrderPagination.getBusinessLineId());
+            List<ContractLEntity> contractLEntityList = businessOrderService.querySaleContractInfo(businessOrderPagination.getBusinessLineId());
+            list = contractLEntityList.stream().filter(e -> e.getContractNumber().equals(businessOrderPagination.getContractNo())).collect(Collectors.toList());
             for (ContractLEntity entity : list){
-                List<String> productByContract = new ArrayList<>();
                 List<ProductByContractModel> productByContractModelList =  businessOrderService.queryProductByContractInfo(entity.getId());
                 entity.setProductByContractModelList(productByContractModelList);
-                for (ProductByContractModel model : productByContractModelList){
-                    productByContract.add(model.getProductId());
-                }
-                if(productByContract.containsAll(productIds)){
-                    List<ContractLEntity> contract = list.stream().filter(e ->e.getId().equals(entity.getId())).collect(Collectors.toList());
-                    contractList.addAll(contract);
-                }
-                entity.setProductByContractModelList(productByContractModelList);
                 QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
                 subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
                 List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
                 entity.setSubjectbasicEntityList(subjectbasicEntityList);
             }
+            contractList.addAll(list);
+//            for (ContractLEntity entity : list){
+//                List<String> productByContract = new ArrayList<>();
+//                List<ProductByContractModel> productByContractModelList =  businessOrderService.queryProductByContractInfo(entity.getId());
+//                entity.setProductByContractModelList(productByContractModelList);
+//                for (ProductByContractModel model : productByContractModelList){
+//                    productByContract.add(model.getProductId());
+//                }
+//                if(productByContract.containsAll(productIds)){
+//                    List<ContractLEntity> contract = list.stream().filter(e ->e.getId().equals(entity.getId())).collect(Collectors.toList());
+//                    contractList.addAll(contract);
+//                }
+//                entity.setProductByContractModelList(productByContractModelList);
+//                QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
+//                subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
+//                List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
+//                entity.setSubjectbasicEntityList(subjectbasicEntityList);
+//            }
         }
         PageListVO vo = new PageListVO();
         vo.setList(contractList);

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue

@@ -129,6 +129,10 @@
           </el-table-column>
           <el-table-column prop="purchaseDeliveryOrder" label="关联单据号" align="center" width="160">
           </el-table-column>
+          <el-table-column prop="purchaseContractNo" label="采购合同编号" align="center" width="260">
+          </el-table-column>
+          <el-table-column prop="saleContractNo" label="销售合同编号" align="center" width="260">
+          </el-table-column>
           <el-table-column prop="vehicleNumber" label="车牌号" align="center" width="100">
           </el-table-column>
           <el-table-column label="运输方式" prop="modeTransport1" align="center" width="100">

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue

@@ -1212,6 +1212,7 @@ export default {
         businessOrderProductRelationalList: [],
         version: 0,
         contractInfoList: [],
+        saleContractNo: undefined,
       },
       tableRequiredData: {},
       dataRule:
@@ -1652,9 +1653,9 @@ export default {
     contractInfo2() {
       let contractType = '2' //销售合同
       this.ContractBoxVisible = true
-      let contractNo = ''//合同号
+      let saleContractNo = this.dataForm.saleContractNo//合同号
       this.$nextTick(() => {
-        this.$refs.ContractBox.init(this.dataForm.businessLineId, this.productIds, contractType, contractNo)
+        this.$refs.ContractBox.init(this.dataForm.businessLineId, this.productIds, contractType, saleContractNo)
       })
     },
     contractList(list) {
@@ -1811,6 +1812,7 @@ export default {
         this.dataForm.enterpriseId = data[0].supplierId
         this.dataForm.firstSubjectBasicId = data[0].customerId
         this.dataForm.deliveryType = data[0].deliveryType
+        this.dataForm.saleContractNo = data[0].saleContractNo
         var voucherIdList = {
           voucherIds: []
         }