按钮修改

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

@@ -237,7 +237,6 @@
     <select id="querySaleContract" resultMap="contractList">
         SELECT
             a.*,
-            b.id as firstCustomId,
             b.name AS firstCustomName,
             c.f_full_name AS enterpriseName,
             d.contract_name AS relatedContractName,
@@ -266,7 +265,6 @@
     <select id="queryPurchaseContract" resultMap="contractList">
         SELECT
             a.*,
-            b.id as firstSupplyId,
             b.name AS firstSupplyName,
             c.f_full_name AS enterpriseName,
             d.contract_name AS relatedContractName,

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

@@ -56,15 +56,10 @@
         END AS receiptType1,
         CASE
         a.receipt_status
-        when '1' then '待校验'
+        when '1' then '待提交'
         when '2' then '待审核'
-        when '3' then '待处理'
+        when '3' then '已完成'
-        when '4' then '待执行'
+        when '4' then '已关闭'
-        when '5' then '执行中'
-        when '6' then '已完成'
-        when '7' then '校验失败'
-        when '8' then '已取消'
-        when '9' then '已驳回'
         END AS receiptStatus1,
         b.return_cargo_code AS returnCargoOrder,
         c.name AS receiptWarehouse,

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

@@ -1049,12 +1049,17 @@ public class BusinessOrderController {
      *
      * @return
      */
-    @Operation(summary = "获取采购合同列表(携带商品ids)")
+    @Operation(summary = "获取采购/销售合同列表(携带商品ids)")
     @PostMapping("/contract/getPurchaseContractList")
     public ActionResult list4(@RequestBody BusinessOrderPagination businessOrderPagination)throws IOException{
         List<String> productIds = businessOrderPagination.getProductIds();
         List<ContractLEntity> contractList = new ArrayList<>();
-        List<ContractLEntity> list= businessOrderService.queryPurchaseContractInfo(businessOrderPagination.getBusinessLineId());
+        List<ContractLEntity> list = new ArrayList<>();
+        if (StringUtils.isNotEmpty(businessOrderPagination.getContractType()) && businessOrderPagination.getContractType().equals("1")) {
+            list = businessOrderService.queryPurchaseContractInfo(businessOrderPagination.getBusinessLineId());
+        }else {
+            list = businessOrderService.querySaleContractInfo(businessOrderPagination.getBusinessLineId());
+        }
         for (ContractLEntity entity : list){
             List<String> productByContract = new ArrayList<>();
             List<ProductByContractModel> productByContractModelList =  businessOrderService.queryProductByContractInfo(entity.getId());
@@ -1068,7 +1073,7 @@ public class BusinessOrderController {
             }
             entity.setProductByContractModelList(productByContractModelList);
             QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
-            subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getFirstSupplyId());
+            subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
             List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
             entity.setSubjectbasicEntityList(subjectbasicEntityList);
         }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderPagination.java

@@ -63,4 +63,7 @@ public class BusinessOrderPagination extends Pagination {
     /** 商品idList */
     @JsonProperty("productIds")
     private List<String> productIds;
+    /** 合同类型 */
+    @JsonProperty("contractType")
+    private String contractType;
 }

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/OrderContractBox.vue

@@ -64,12 +64,16 @@ export default {
       },
       excludeIdList: [],
       businessLineId: '',
+      contractType: '',
       productIds: [],
       checked: []
     }
   },
   methods: {
-    init(businessLineId, productIds) {
+    init(businessLineId, productIds, contractType) {
+      if (contractType && typeof (contractType) == 'string') {
+        this.contractType = contractType;
+      }
       if (businessLineId && typeof (businessLineId) == 'string') {
         this.businessLineId = businessLineId;
       }
@@ -82,7 +86,8 @@ export default {
         ...this.listQuery,
         keyword: this.keyword,
         businessLineId: this.businessLineId,
-        productIds: this.productIds
+        productIds: this.productIds,
+        contractType: this.contractType
       }
       request({
         url: `/api/scm/BusinessOrder/contract/getPurchaseContractList`,

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue

@@ -1775,9 +1775,10 @@ export default {
       this.dataForm.businessOrderProductRelationalList = val2.productByContractModelList
     },
     contractInfo2() {
+      let contractType = '1'//采购合同
       this.ContractBoxVisible = true
       this.$nextTick(() => {
-        this.$refs.ContractBox.init(this.dataForm.businessLineId, this.productIds)
+        this.$refs.ContractBox.init(this.dataForm.businessLineId, this.productIds, contractType)
       })
     },
     contractList(list) {
@@ -1870,6 +1871,7 @@ export default {
       if (data.flag == '采购收货凭证生成采购单') {
         this.productCreate = true
         this.dataForm.orderType = '3'
+        this.dataForm.deliveryType = '2'
         this.dataForm.firstSubjectBasicId = data[0].supplierId
         this.dataForm.enterpriseId = data[0].customerId
         var voucherIdList = {
@@ -2020,6 +2022,15 @@ export default {
           isOk = false
           break
         }
+        if (!e.businessPrice) {
+          this.$message({
+            message: '采购单价不能为空',
+            type: 'error',
+            duration: 1000
+          });
+          isOk = false
+          break
+        }
       }
       return isOk;
     },

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue

@@ -366,8 +366,10 @@ export default {
       const selectData = this.multipleSelectionItem
       let stateFlag = true;
       const customId = selectData[0].customerId;
+      const deliveryType = selectData[0].deliveryType;
       let customerIdFlag = true;
       let purchaseFlag = true;
+      let deliveryFlag = true;
       selectData.forEach(function (item) {
         if (item.flowState != 2) {
           stateFlag = false;
@@ -378,6 +380,9 @@ export default {
         if (item.isTransfer != '1') {
           purchaseFlag = false;
         }
+        if (item.deliveryType != deliveryType) {
+          deliveryFlag = false;
+        }
       });
       if (!stateFlag) {
         this.$message({
@@ -395,6 +400,14 @@ export default {
         })
         return
       }
+      if (!deliveryFlag) {
+        this.$message({
+          type: 'error',
+          message: '凭证配送方式不一致',
+          duration: 1500,
+        })
+        return
+      }
       if (!purchaseFlag) {
         this.$message({
           type: 'error',

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

@@ -1639,12 +1639,14 @@ export default {
       this.dataForm.businessOrderProductRelationalList = val2.productByContractModelList
     },
     contractInfo2() {
+      let contractType = '2' //销售合同
       this.ContractBoxVisible = true
       this.$nextTick(() => {
-        this.$refs.ContractBox.init(this.dataForm.businessLineId, this.productIds)
+        this.$refs.ContractBox.init(this.dataForm.businessLineId, this.productIds, contractType)
       })
     },
     contractList(list) {
+      debugger
       let e = list
       this.dataForm.contractId = e.id
       this.dataForm.contractName = e.contractName
@@ -1662,7 +1664,7 @@ export default {
       this.dataForm.transactionMode = e.deliveryModel
       this.dataForm.deliveryAddress = e.deliveryLocation
       e.subjectbasicEntityList[0].subjectBasicId = e.subjectbasicEntityList[0].id
-      e.subjectbasicEntityList[0].businessType = '1'
+      e.subjectbasicEntityList[0].businessType = '2'
       this.dataForm.settlementInfoList = e.subjectbasicEntityList
       const subjectInfo = e.subjectbasicEntityList[0]
       if (subjectInfo.underpaymentMethod == 0) {
@@ -1886,6 +1888,15 @@ export default {
           isOk = false
           break
         }
+        if (!e.businessPrice) {
+          this.$message({
+            message: '销售单价不能为空',
+            type: 'error',
+            duration: 1000
+          });
+          isOk = false
+          break
+        }
       }
       return isOk;
     },