Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -182,6 +182,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String InOutWarehouse(WarehouseInOutInfo warehouseInOutInfo) {
+        // 先删除任务
+        noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "INOUTTASK-TASK-APPROVE",
+                warehouseInOutInfo.getId(), null);
         WarehouseInOutDetail warehouseInOutDetail = warehouseInOutInfo.getWarehouseInOutDetail();
         // 查询仓库
         WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(warehouseInOutInfo.getBaseId());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/AcquisitionListener.java

@@ -0,0 +1,50 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.yh.saas.common.support.workflow.AbstractWorkflowTaskListener;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskListener;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchasePrice;
+import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
+import com.yh.saas.plugin.yiliangyiyun.service.IPurchasePriceService;
+import com.yh.saas.plugin.yiliangyiyun.service.ISaleOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@WorkflowTaskListener(name = "收购管理", group = "仓库设置")
+public class AcquisitionListener extends AbstractWorkflowTaskListener {
+
+    private static final long serialVersionUID = 4103656734835351132L;
+
+    @Autowired
+    private IPurchasePriceService purchasePriceService;
+
+    @Override
+    public void handleStatusChanged(String businessKey, String status, String statusEn, boolean processIsEnd) {
+        PurchasePrice purchasePrice = purchasePriceService.selectById(businessKey);
+        if (purchasePrice == null) {
+            return;
+        }
+        if (processIsEnd) {
+            purchasePrice.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+            purchasePrice.setStatus(StatusEnum.ORDER_PASSED.getName());
+            purchasePrice.setWorkflowId(null);
+            purchasePrice.setApproveStatus(null);
+        } else {
+            purchasePrice.setApproveStatus(status);
+        }
+        purchasePriceService.updateAllColumnById(purchasePrice);
+    }
+
+    @Override
+    public void handleRejectApplicationRepulsed(String workflowId, String businessKey, boolean needReapply) {
+        PurchasePrice purchasePrice = purchasePriceService.selectById(businessKey);
+        if (purchasePrice == null) {
+            return;
+        }
+        purchasePrice.setStatusFlag(StatusEnum.TASK_RETURN.getFlag());
+        purchasePrice.setStatus(StatusEnum.TASK_RETURN.getName());
+        purchasePrice.setApproveStatus(null);
+        purchasePriceService.updateAllColumnById(purchasePrice);
+
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/acquisitionPayListener.java

@@ -0,0 +1,50 @@
+package com.yh.saas.plugin.yiliangyiyun.workflow;
+
+import com.yh.saas.common.support.workflow.AbstractWorkflowTaskListener;
+import com.yh.saas.common.support.workflow.annotation.WorkflowTaskListener;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchasePrice;
+import com.yh.saas.plugin.yiliangyiyun.service.IPaymentManagementService;
+import com.yh.saas.plugin.yiliangyiyun.service.IPurchasePriceService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@WorkflowTaskListener(name = "收购管理", group = "付款管理")
+public class acquisitionPayListener extends AbstractWorkflowTaskListener {
+
+    private static final long serialVersionUID = 4103656734835351132L;
+
+    @Autowired
+    private IPaymentManagementService paymentManagementService;
+
+    @Override
+    public void handleStatusChanged(String businessKey, String status, String statusEn, boolean processIsEnd) {
+        PaymentManagement paymentManagement = paymentManagementService.selectById(businessKey);
+        if (paymentManagement == null) {
+            return;
+        }
+        if (processIsEnd) {
+            paymentManagement.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+            paymentManagement.setStatus(StatusEnum.ORDER_PASSED.getName());
+            paymentManagement.setWorkflowId(null);
+            paymentManagement.setApproveStatus(null);
+        } else {
+            paymentManagement.setApproveStatus(status);
+        }
+        paymentManagementService.updateAllColumnById(paymentManagement);
+    }
+
+    @Override
+    public void handleRejectApplicationRepulsed(String workflowId, String businessKey, boolean needReapply) {
+        PaymentManagement paymentManagement = paymentManagementService.selectById(businessKey);
+        if (paymentManagement == null) {
+            return;
+        }
+        paymentManagement.setStatusFlag(StatusEnum.TASK_RETURN.getFlag());
+        paymentManagement.setStatus(StatusEnum.TASK_RETURN.getName());
+        paymentManagement.setApproveStatus(null);
+        paymentManagementService.updateAllColumnById(paymentManagement);
+
+    }
+
+}