产品信息记录、供应商准入

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.jsp

@@ -79,6 +79,9 @@
         </div>
         <x:title title="责任人信息" name="group" hideTable="#info" />
         <div id="dutyPersonGrid"></div>
+        <div class="hg-form-row">
+            <x:inputC name="payMoney" label="赔付金额" labelCol="1" fieldCol="2" required="false" readonly="true"/>
+        </div>
     </form>
 </div>
 </body>
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageList.js

@@ -33,9 +33,9 @@ function loadCostCenterListGrid() {
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
             {display: "品名", name: "productName", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "数量", name: "number", width: 100, minWidth: 60, type: "string", align: "left"},
-            {display: "单位", name: "unitName", width: 100, minWidth: 60, type: "string", align: "left"},
-            {display: "是否收费", name: "isChargeTextView", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "数量", name: "number", width: 80, minWidth: 60, type: "string", align: "left"},
+            {display: "单位", name: "unitName", width: 80, minWidth: 60, type: "string", align: "left"},
+            {display: "是否收费", name: "isChargeTextView", width: 80, minWidth: 60, type: "string", align: "left"},
             {display: "工厂", name: "werksName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "库存地点", name: "storeName", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "供应商", name: "supplierName", width: 140, minWidth: 60, type: "string", align: "left"},

topsun-xt/src/main/webapp/biz/topsun/sap/produceSupplierReview/produceSupplierReviewDetail.js

@@ -107,6 +107,9 @@ $(document).ready(function () {
 });
 
 function initialize() {
+    $('#produceSupplierInfoList').fileList({
+        bizId : $("#attbizId").val()
+    });
     //获取数据源初始化表格
     Public.ajax(web_app.name + '/produceSupplierReview/slicedNewSupplierReviewItemList.ajax', {newSupplierReviewId: getId()}, function (data) {
         //根据定义列拆除实体对象，封装成每个table对应的数据集

topsun-xt/src/main/webapp/biz/topsun/sap/produceSupplierReview/produceSupplierReviewDetail.jsp

@@ -26,6 +26,7 @@
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
     <x:hidden name="statusId"/>
+    <x:hidden name="attbizId"/>
     <div class="container-fluid">
         <div id="produceSupplierReview-ledger-tab">
             <div class="ui-tab-links">
@@ -115,6 +116,9 @@
                             <x:radioC name="isOnsiteAudit" title="是否安排实地考察" dictionary="yesorno" required="false" label="是否安排实地考察" labelCol="2" fieldCol="2"/>
                             <x:radioC name="isApprovedSupplier" title="是否录入合格供方" dictionary="yesorno" required="false" label="是否录入合格供方" labelCol="2" fieldCol="2"/>
                         </div>
+                        <div style="padding-top: 15px;">
+                            <x:fileList bizCode="produceSupplierInfo" bizId="attbizId" id="produceSupplierInfoList" title="相关资料" />
+                        </div>
                     </div>
                 </div>
                 <div class="layout">

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp

@@ -86,6 +86,10 @@
             <x:inputC name="kstbm3" label="等级数量3" labelCol="1" fieldCol="2" required="false" mask="9999999.99"/>
             <x:inputC name="kbetr3" label="等级金额3" labelCol="1" fieldCol="2" required="false" mask="9999999.99"/>
 
+                <x:inputC name="kstbm4" label="等级数量4" labelCol="1" fieldCol="2" required="false" mask="9999999.99"/>
+                <x:inputC name="kbetr4" label="等级金额4" labelCol="1" fieldCol="2" required="false" mask="9999999.99"/>
+                <x:inputC name="kstbm5" label="等级数量5" labelCol="1" fieldCol="2" required="false" mask="9999999.99"/>
+                <x:inputC name="kbetr5" label="等级金额5" labelCol="1" fieldCol="2" required="false" mask="9999999.99"/>
            </div>
 
     </div>

topsun/src/main/java/com/huigou/topsun/base/bsnMessage/appliction/impl/MannualStartWorkApplicationImpl.java

 package com.huigou.topsun.base.bsnMessage.appliction.impl;
 
 
+import com.huigou.cache.SystemCache;
 import com.huigou.context.Operator;
 import com.huigou.context.ThreadLocalUtil;
 import com.huigou.topsun.base.bsnMessage.appliction.MannualStartWorkApplication;
@@ -40,7 +41,7 @@ public class MannualStartWorkApplicationImpl extends BaseApplication implements
         Operator operator = null;
         operator = ThreadLocalUtil.getOperator();
         if (operator == null) {
-            String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
+            String createdById = SystemCache.getParameter("adminPersonId", String.class);
             operator = operatorApplication.createOperatorByPersonMemberId(createdById);
             ThreadLocalUtil.putOperator(operator);
         }

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderApplicationImpl.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.ep.order.application.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.huigou.cache.SystemCache;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
 import com.huigou.context.ThreadLocalUtil;
@@ -202,7 +203,7 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
             BeanUtil.copyProperties(epSaleOrderVo,epSaleOrder);
 
             //初始化用户信息
-            String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
+            String createdById =  SystemCache.getParameter("adminPersonId", String.class);
             Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
             epSaleOrder.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
 
@@ -241,7 +242,7 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
     private SDO buildSDO(Map<String, Object> formData) {
         //String createdById = (String) formData.get("createdById");
         //暂定管理员id
-        String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
+        String createdById =  SystemCache.getParameter("adminPersonId", String.class);
         Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
         SDO localSdo = new SDO();
         // 将业务数据传递给工作流

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.ep.order.application.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.huigou.cache.SystemCache;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
 import com.huigou.context.ThreadLocalUtil;
@@ -201,7 +202,7 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
             BeanUtil.copyProperties(epSaleOrderCancelVo,epSaleOrderCancel);
 
             //初始化用户信息
-            String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
+            String createdById = SystemCache.getParameter("adminPersonId", String.class);
             Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
             epSaleOrderCancel.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
 
@@ -240,7 +241,7 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
     private SDO buildSDO(Map<String, Object> formData) {
         //String createdById = (String) formData.get("createdById");
         //暂定管理员id
-        String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
+        String createdById =  SystemCache.getParameter("adminPersonId", String.class);
         Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
         SDO localSdo = new SDO();
         // 将业务数据传递给工作流

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.huigou.cache.DictUtil;
+import com.huigou.cache.SystemCache;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
 import com.huigou.data.domain.model.CommonDomainConstants;
@@ -511,7 +512,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
     public String saveProdApplyFromSapVO(ProdApplyFromSapVO prodApplyFromSapVO) {
 
         //初始化用户信息
-         String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
+         String createdById = SystemCache.getParameter("adminPersonId", String.class);
          Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
          String  message="";
    try {

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -399,7 +399,6 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             throw new RuntimeException(backStr);
         } finally {
             sapMutualEpLogApplication.saveSapMutualEpLog(backMap);
-           // String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
             Operator operator = operatorApplication.createOperatorByPersonMemberId(baseInfo.getPersonMemberId());
             saveBsnMessageData(baseInfo,applyDept,operator,backMap);
             return backStr;

topsun/src/main/java/com/huigou/topsun/sap/produceSupplierReview/controller/ProduceSupplierReviewController.java

@@ -11,6 +11,7 @@ import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bmp.doc.attachment.application.AttachmentApplication;
 import com.huigou.uasp.bmp.doc.attachment.domain.model.Attachment;
 import com.huigou.uasp.client.CommonController;
+import com.huigou.util.CommonUtil;
 import com.huigou.util.Constants;
 import com.huigou.util.SDO;
 import com.huigou.util.StringUtil;
@@ -73,6 +74,7 @@ public class ProduceSupplierReviewController extends CommonController {
         this.putAttribute("procUnitId", "Apply");
         ProduceSupplierReview produceSupplierReview = new ProduceSupplierReview();
         produceSupplierReview.setStatusId(BizBillStatus.APPLYING.getId());
+        produceSupplierReview.setAttbizId(CommonUtil.createGUID()); // 自动生成附件id
         /**
          * 设置jsp页面初始化填充数据，如果不设置， 那么在jsp页面上填写完表单之后立即提交申请TaskDescription获取不到时间和相关人员信息
          */

topsun/src/main/java/com/huigou/topsun/sap/produceSupplierReview/domain/ProduceSupplierReview.java

@@ -270,6 +270,8 @@ public class ProduceSupplierReview extends FlowBillAbstractEntity {
     @Column(name = "final_review_deal_result")
     private String finalReviewDealResult;
 
+    @Column(name = "attbiz_id")
+    private String attbizId;
     @Override
     protected String getCodeRuleId() {
         return "produceSupplierReview";

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.huigou.cache.SystemCache;
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
 import com.huigou.context.ThreadLocalUtil;
@@ -393,7 +394,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
     private SDO buildSDO(Map<String, Object> formData) {
         //String createdById = (String) formData.get("createdById");
         //暂定管理员id
-        String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
+        String createdById =  SystemCache.getParameter("adminPersonId", String.class);
         Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
         SDO localSdo = new SDO();
         // 将业务数据传递给工作流

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/SapPurchaseInfoRecordItem.java

@@ -317,6 +317,31 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
     @Column(name = "KBETR3")
     private BigDecimal kbetr3;
 
+    /**
+     * 等级数量4
+     */
+    @Column(name = "KSTBM4")
+    private BigDecimal kstbm4;
+
+    /**
+     * 等级金额4
+     */
+    @Column(name = "KBETR4")
+    private BigDecimal kbetr4;
+
+
+    /**
+     * 等级数量5
+     */
+    @Column(name = "KSTBM5")
+    private BigDecimal kstbm5;
+
+    /**
+     * 等级金额5
+     */
+    @Column(name = "KBETR5")
+    private BigDecimal kbetr5;
+
     /**
      * 消息类型
      */

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/vo/SapPurchaseInfoRecordItemVo.java

@@ -144,6 +144,31 @@ public class SapPurchaseInfoRecordItemVo implements Serializable {
     @JsonProperty("KBETR3")
     private BigDecimal kbetr3;
 
+    /**
+     * 条件等级数量4
+     */
+    @JsonProperty("KSTBM4")
+    private BigDecimal kstbm4;
+
+    /**
+     * 等级金额4
+     */
+    @JsonProperty("KBETR4")
+    private BigDecimal kbetr4;
+
+
+    /**
+     * 条件等级数量5
+     */
+    @JsonProperty("KSTBM5")
+    private BigDecimal kstbm5;
+
+    /**
+     * 等级金额5
+     */
+    @JsonProperty("KBETR5")
+    private BigDecimal kbetr5;
+
 
     /**
      * 销售员

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

@@ -219,7 +219,6 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         }else {
             //throw new RuntimeException("未找到采购订单创建人：" + ernam);
         }
-        //String createdById = "5EEB2DC861694A65933CB4CE9A8D870A@C18E23AAAA6940E09DF7C122332C51E0";
 
         List<SapPurchaseOrderItemVo> ltItems = sapPurchaseOrderDto.getLtItems();
         List<SapPurchaseOrderItem> purchaseOrderItems = new ArrayList<>();

topsun/src/main/java/com/huigou/topsun/sap/suppliers/controller/ImpDataFromXLS.java

 package com.huigou.topsun.sap.suppliers.controller;
 
 import com.huigou.cache.DictUtil;
+import com.huigou.cache.SystemCache;
+import com.huigou.context.Operator;
 import com.huigou.topsun.common.CommonUtils;
 import com.huigou.topsun.sap.suppliers.application.SuppliersDataApplication;
 import com.huigou.topsun.sap.suppliers.domain.SuppliersBank;
@@ -12,6 +14,8 @@ import com.huigou.topsun.sap.suppliers.repository.SuppliersBuyerRepository;
 import com.huigou.topsun.sap.suppliers.repository.SuppliersInfoRepository;
 import com.huigou.topsun.sap.suppliers.repository.SuppliersPayRepository;
 import com.huigou.topsun.util.CommonUtil;
+import com.huigou.uasp.bmp.fn.CodeGenerator;
+import com.huigou.uasp.bmp.operator.OperatorApplication;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
@@ -22,13 +26,17 @@ import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.beans.Transient;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.List;
 
 @Service("impDataFromXLS")
 public class ImpDataFromXLS {
@@ -41,6 +49,10 @@ public class ImpDataFromXLS {
     SuppliersBuyerRepository suppliersBuyerRepository;
     @Autowired
     SuppliersBankRepository suppliersBankRepository;
+    @Resource
+    private OperatorApplication operatorApplication;
+    @Autowired
+    private CodeGenerator codeGenerator;
 
     public static void main(String[] args) {
         ImpDataFromXLS obj=new ImpDataFromXLS();
@@ -78,6 +90,20 @@ public class ImpDataFromXLS {
                   //
                   SuppliersInfo suppliersInfo = new SuppliersInfo();
                   suppliersInfo.setRltgr("Z00001X");
+                  suppliersInfo.setApplyType("0");
+                  suppliersInfo.setStatusId(3);
+                 // suppliersInfo.setBillCode();
+                  String createdById = SystemCache.getParameter("adminPersonId", String.class);
+                  Operator operator = operatorApplication.createOperatorByPersonMemberId(createdById);
+                  suppliersInfo.setFullId(operator.getFullId());
+                  suppliersInfo.setPersonMemberId(createdById);
+                  suppliersInfo.setPersonMemberName(operator.getPersonMemberName());
+                  suppliersInfo.setFillinDate(new Date());
+                  String nextCode = codeGenerator.getNextCode("sapSuppliersInfo");
+                  suppliersInfo.setBillCode(nextCode);
+                  suppliersInfo.setOrganId(operator.getOrgId());
+                  suppliersInfo.setOrganName(operator.getOrgName());
+                  suppliersInfo.setDeptName(operator.getDeptName());
 
                   SuppliersBank  bank=new SuppliersBank();
                   SuppliersBuyer buyer=new SuppliersBuyer();
@@ -90,7 +116,7 @@ public class ImpDataFromXLS {
                       assembleData(suppliersInfo,bank,buyer,pay,num,cellValue);
                       System.out.print(num+ "=" + cellValue + " ");
                   }
-                 // saveData(suppliersInfo,bank,buyer,pay);
+                  saveData(suppliersInfo,bank,buyer,pay);
                   System.out.println();
               }
           }
@@ -254,19 +280,26 @@ public class ImpDataFromXLS {
 
 
   }
-
+    @Transactional
   public void saveData(SuppliersInfo suppliersInfo,SuppliersBank bank,SuppliersBuyer buyer,SuppliersPay pay){
       try {
-          suppliersInfo = suppliersInfoRepository.save(suppliersInfo);
-          if (StringUtils.isNotBlank(bank.getBanks())){
-              bank.setSId(suppliersInfo.getId());
-              suppliersBankRepository.save(bank);
+          List<SuppliersInfo> list=suppliersInfoRepository.findByPartner(suppliersInfo.getPartner());
+          if (list.size()>0){
+              suppliersInfo=list.get(0);
+          } else {
+              suppliersInfo = suppliersInfoRepository.save(suppliersInfo);
+          }
+          if (StringUtils.isNotBlank(bank.getBankn())){ //银行代码存在
+              if (suppliersBankRepository.findByBankn(bank.getBankn()).size()<1) {
+                  bank.setSId(suppliersInfo.getId());
+                  suppliersBankRepository.save(bank);
+              }
           }
-          if (StringUtils.isNotBlank(buyer.getEkorg())) {
+          if (StringUtils.isNotBlank(buyer.getEkorg())) { //采购组织存在
               buyer.setSId(suppliersInfo.getId());
               suppliersBuyerRepository.save(buyer);
           }
-          if (StringUtils.isNotBlank(pay.getBukrs())) {
+          if (StringUtils.isNotBlank(pay.getBukrs())) { //公司代码
               pay.setSId(suppliersInfo.getId());
               suppliersPayRepository.save(pay);
           }

topsun/src/main/java/com/huigou/topsun/sap/suppliers/repository/SuppliersBankRepository.java

@@ -15,4 +15,6 @@ import java.util.List;
 public interface SuppliersBankRepository extends JpaRepository<SuppliersBank,String> {
 
     List<SuppliersBank> findAllBySId(String sId);
+
+    List<SuppliersBank> findByBankn(String bankn);
 }

topsun/src/main/java/com/huigou/topsun/sap/suppliers/repository/SuppliersInfoRepository.java

@@ -17,4 +17,5 @@ public interface SuppliersInfoRepository extends JpaRepository<SuppliersInfo,Str
    // @Query(" select t.* from sap_suppliers_info t where 1=1 and apply_type='-1' and status in (1,3) and id= #{id}")
   //  List<SuppliersInfo> findDeletedById(String id);
 
+    List<SuppliersInfo> findByPartner(String partner);
 }