采购订单审批加上供应商字段；退货项目审批完成自动创建放行条

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp

@@ -39,6 +39,8 @@
                           required="false"/>
                 <x:inputC name="totalMoney" label="订单总金额" readonly="true" labelCol="1" fieldCol="2"
                           required="false"/>
+                <x:inputC name="namel" label="供应商" readonly="true" labelCol="1" fieldCol="2"
+                          required="false"/>
             </div>
         </div>
         <x:title title="sap回执" name="group"/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js

@@ -39,6 +39,7 @@ function loadGrid() {
                 , {display: "采购订单号码", name: "ebeln", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "采购订单类型", name: "bsart", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "采购订单类型描述", name: "batxt", width: 150, minWidth: 60, type: "string", align: "center"}
+                , {display: "供应商", name: "namel", width: 200, minWidth: 60, type: "string", align: "center"}
                 , {display: "sap回执", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
                 , {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"}
 

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -14,6 +14,9 @@ import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.base.bsnMessage.appliction.MannualStartWorkApplication;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
 import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
+import com.huigou.topsun.sap.permit.application.SapPermitApplication;
+import com.huigou.topsun.sap.permit.vo.SapPermitItemVo;
+import com.huigou.topsun.sap.permit.vo.SapPermitVo;
 import com.huigou.topsun.sap.purchase.domain.SapPurchase;
 import com.huigou.topsun.sap.purchase.domain.SapPurchaseItem;
 import com.huigou.topsun.sap.purchaseApproval.application.impl.SapPurchaseApprovalApplicationImpl;
@@ -26,6 +29,8 @@ import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderDto;
 import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderItemVo;
 import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderVo;
 import com.huigou.topsun.sap.purchaseOrder.repository.SapPurchaseOrderRepository;
+import com.huigou.topsun.sap.wasteSale.domain.WasteSale;
+import com.huigou.topsun.sap.wasteSale.domain.WasteSaleItem;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bmp.fn.CodeGenerator;
 import com.huigou.uasp.bmp.operator.OperatorApplication;
@@ -42,12 +47,14 @@ import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
 import org.activiti.engine.impl.persistence.entity.TaskEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -72,6 +79,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
     private MannualStartWorkApplication mannualStartWorkApplication;
     @Autowired
     private OrgApplication orgApplication;
+    @Autowired
+    private SapPermitApplication sapPermitApplication;
+    @Autowired
+    private TaskExecutor asyncWriteExecutor;
 
     @Override
     protected String saveBizAndApprovalData() {
@@ -166,6 +177,42 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         sapPurchaseOrder.setStatusId(status.getId());
         SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder);
         this.sendSapDate(save, "Y");
+        asyncWriteExecutor.execute(()->
+                //创建放行条
+                this.startSapPermit(sapPurchaseOrder)
+        );
+    }
+
+    public void startSapPermit(SapPurchaseOrder purchaseOrder){
+        SapPermitVo sapPermitVo = new SapPermitVo();
+        sapPermitVo.setCompany(purchaseOrder.getNamel());//供应商
+        sapPermitVo.setApplyPerson(purchaseOrder.getPersonMemberId());
+        sapPermitVo.setApplyPersonName(purchaseOrder.getPersonMemberName());
+        sapPermitVo.setDutyDepart(purchaseOrder.getDeptId());
+        sapPermitVo.setDutyDepartName(purchaseOrder.getDeptName());
+        sapPermitVo.setPermitDate(new Date());
+        List<SapPermitItemVo> sapPermitItemVos = new ArrayList<>();
+        List<SapPurchaseOrderItem> purchaseOrderItems = sapPurchaseOrderItemApplication.getPurchaseOrderItems(purchaseOrder.getId());
+        for (SapPurchaseOrderItem purchaseOrderItem : purchaseOrderItems) {
+            //退货项目创建放行条
+            if ("X".equals(purchaseOrderItem.getRetpo())){
+                SapPermitItemVo sapPermitItemVo = new SapPermitItemVo();
+                sapPermitItemVo.setBelongings(purchaseOrderItem.getMatnr() + "/" + purchaseOrderItem.getTxz01());
+                sapPermitItemVo.setUnit(purchaseOrderItem.getMeins());
+
+                String remark="采购订单项:"+purchaseOrder.getEbeln()+"："+purchaseOrderItem.getEbelp();
+                sapPermitItemVo.setRemark(remark);
+                sapPermitItemVo.setQuantity(new BigDecimal(purchaseOrderItem.getMenge()));
+                sapPermitItemVo.setUnitName(purchaseOrderItem.getMsehl());
+                sapPermitItemVos.add(sapPermitItemVo);
+            }
+        }
+        if (!CollectionUtils.isEmpty(sapPermitItemVos)){
+            sapPermitVo.setItemVos(sapPermitItemVos);
+            //创建放行条
+            sapPermitApplication.saveSapPermitVo(sapPermitVo);
+        }
+
     }
 
 

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrder.java

@@ -154,6 +154,12 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity {
     @Column(name = "retpo")
      private String retpo;
 
+    /**
+     * 供应商名称
+     */
+    @Column(name = "NAMEL")
+    private String namel;
+
     @Override
     protected String getCodeRuleId() {
         return "sapPurchaseOrder";

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderVo.java

@@ -59,4 +59,8 @@ public class SapPurchaseOrderVo implements Serializable {
     @JsonProperty("EKNAM")
     private String eknam;
 
+
+    @JsonProperty("NAMEL")
+    private String namel;
+
 }