采购按钮功能实现

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReturnCargoOrderServiceImpl.java

@@ -2,6 +2,7 @@ package jnpf.service.impl;
 
 import jnpf.entity.*;
 import jnpf.mapper.ReturnCargoOrderMapper;
+import jnpf.mapper.VoucherMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.returncargoorder.*;
@@ -55,6 +56,8 @@ public class ReturnCargoOrderServiceImpl extends ServiceImpl<ReturnCargoOrderMap
     private DeliveryProductRelationService deliveryProductRelationService;
     @Resource
     private ReturnCargoOrderMapper returnCargoOrderMapper;
+    @Resource
+    private VoucherMapper voucherMapper;
     @Override
     public List<ReturnCargoOrderEntity> getList(ReturnCargoOrderPagination returnCargoOrderPagination){
         return getTypeList(returnCargoOrderPagination,returnCargoOrderPagination.getDataType());
@@ -478,6 +481,10 @@ public class ReturnCargoOrderServiceImpl extends ServiceImpl<ReturnCargoOrderMap
                 }else{
                 }
                 deliveryVoucherRelationService.saveOrUpdate(entitys);
+                VoucherEntity voucherEntity = voucherMapper.selectById(entitys.getVoucherId());
+                voucherEntity.setIsReturnCargoOrder("2");
+                voucherEntity.setBusinessOrderId(entity.getId());
+                voucherMapper.updateById(voucherEntity);
             }
         }
         //DeliveryProductRelation子表数据新增修改

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryVoucherRelationEntity.java

@@ -70,4 +70,7 @@ public class DeliveryVoucherRelationEntity  {
     private Integer deleteMark;
     @TableField("F_TENANT_ID")
     private String tenantId;
+
+    @TableField(exist = false)
+    private String isTransfer;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java

@@ -131,6 +131,8 @@ public class VoucherEntity  {
     private String businessOrderId;
     @TableField("IS_SALE_DELIVERY_VOUCHER")
     private String isSaleDeliveryVoucher;
+    @TableField("IS_RETURN_CARGO_ORDER")
+    private String isReturnCargoOrder;
 
 
     @TableField(exist = false)

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/returncargoorder/DeliveryVoucherRelationModel.java

@@ -67,4 +67,7 @@ public class DeliveryVoucherRelationModel  {
     /** 业务类型 **/
     @JSONField(name = "businessType")
     private String businessType;
+
+    @JSONField(name = "isTransfer")
+    private String isTransfer;
 }

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

@@ -56,6 +56,9 @@
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createReturnCargoOrder()">生成退货订单
             </el-button>
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="createDeliveryOrder()">生成发货单
+            </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -232,6 +235,7 @@ export default {
       flowListVisible: false,
       flowList: [],
       returnCargoFlowList: [],
+      deliveryFlowList: [],
       exportBoxVisible: false,
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
@@ -280,6 +284,15 @@ export default {
         this.$router.push('/404');
       })
     })
+    getFormById("1760911763504566273").then(res1 => {
+      let deliveryFlowId = res1.data && res1.data.id
+      getFlowList(deliveryFlowId, '1').then(res2 => {
+        this.deliveryFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
   },
   methods: {
     createReturnCargoOrder() {
@@ -323,6 +336,16 @@ export default {
         this.flowListVisible = true
       }
     },
+    createDeliveryOrder() {
+      if (!this.multipleSelectionItem.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+    },
     selectFlow1(item, selectData) {
       let data = {
         id: '',

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

@@ -1114,11 +1114,15 @@ export default {
     initPurchaseData() {
       const data = this.setting.selectData
       if (data.flag == '发货凭证生成退货订单') {
-        this.dataForm.firstSubjectBasicId = data[0].supplierId
+        this.dataForm.subjectId = data[0].supplierId
         this.dataForm.enterpriseId = data[0].customerId
         data.forEach(item => {
-          this.dataForm.businessOrderProductRelationalList = []
-          this.dataForm.businessOrderProductRelationalList = item.voucherProductList
+          debugger
+          item.voucherId = item.id
+          item.isTransfer = '2'
+          this.dataForm.deliveryVoucherRelationList.push(item)
+          this.dataForm.deliveryProductRelationList = []
+          this.dataForm.deliveryProductRelationList = item.voucherProductList
         });
       }
     },

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

@@ -773,7 +773,6 @@ export default {
     initPurchaseData() {
       const data = this.setting.selectData
       if (data.flag == '采购收货凭证生成销售发货凭证') {
-        //todo
         data.forEach(item => {
           debugger
           this.dataForm.isSaleDeliveryVoucherSource = item.id

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

@@ -340,6 +340,7 @@ export default {
         return
       }
       const selectData = this.multipleSelectionItem
+      debugger
       if (!this.deliveryVoucherFlowList.length) {
         this.$message({ type: 'error', message: '流程不存在' });
       } else if (this.deliveryVoucherFlowList.length === 1) {

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

@@ -1428,7 +1428,6 @@ export default {
     initPurchaseData() {
       const data = this.setting.selectData
       if (data.flag == '采购转销售') {
-        debugger
         this.dataForm.orderType = '1'
         this.dataForm.isTransferSource = data[0].id
         this.dataForm.businessLineId = data[0].businessLineId_id