Merge remote-tracking branch 'origin/dev' into dev

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js

@@ -3,6 +3,43 @@ $(document).ready(function () {
 
 })
 function initializate() {
-    console.log("aa")
    $("#a").show();
-}
\ No newline at end of file
+    $('input[name="maintenanceType"]').change(function() {
+        if ($(this).is(':checked')) {
+            console.log($(this).val()); // 输出选中的值
+            switch ($(this).val()) {
+                case 'new':
+                    if($("#mtart").val()=="ZMPN"){
+                        UICtrl.enable($("#matnr"));
+                    }else {
+                        UICtrl.disable($("#matnr"));
+                    }
+                    UICtrl.disable($("#lvorm"));
+                    UICtrl.enable($("#mtart"));
+                    UICtrl.enable($("#matkl"));
+                    UICtrl.enable($("#spart"));
+                    break;
+                case 'modify':
+                    UICtrl.enable($("#lvorm"))
+                    UICtrl.disable($("#mtart"));
+                    UICtrl.disable($("#matkl"));
+                    UICtrl.disable($("#spart"));
+                    break;
+                case 'extend':
+                    UICtrl.enable($("#lvorm"))
+                    UICtrl.disable($("#mtart"));
+                    UICtrl.disable($("#matkl"));
+                    UICtrl.disable($("#spart"));
+                    break;
+            }
+        }
+    });
+
+    $('input[name="businessUsage"]').change(function() {
+        if ($(this).is(":checked")) {
+            console.log($(this).val()); // 输出选中的值
+        }
+    });
+
+}
+

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp

@@ -75,21 +75,28 @@
             <x:inputC name="lgtyp" label="存储类型" labelCol="1" fieldCol="2"/>
             <x:inputC name="" label="文本说明" labelCol="1" fieldCol="2"/>
         </div>
+    </div>
+
+    <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
                              fieldCol="11"/>
         </div>
+    </div>
+    <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
         </div>
     </div>
 
-    <div class="hg-form-cols">
+    <div class="hg-form-cols" style="display: none">
         <div class="hg-form-row">
             <x:inputC name="klart" label="类型" labelCol="1" fieldCol="2"/>
             <x:inputC name="classify" label="分类" labelCol="1" fieldCol="2"/>
         </div>
+    </div>
 
+    <div class="hg-form-cols" style="display: none">
         <div class="hg-form-row">
             <x:inputC name="vkorg" label="销售组织" labelCol="1" fieldCol="2"/>
             <x:inputC name="vtweg" label="分销渠道" labelCol="1" fieldCol="2"/>
@@ -111,7 +118,9 @@
             <x:inputC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2"/>
             <x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2"/>
         </div>
-        <div class="hg-form-row box">
+    </div>
+    <div class="hg-form-cols" style="display: none" id="a">
+        <div class="hg-form-row">
             <x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
             <x:inputC name="bstme" label="采购计量单位" labelCol="1" fieldCol="2"/>
             <x:inputC name="umrenPurch" label="转换分母" labelCol="1" fieldCol="2"/>
@@ -119,7 +128,9 @@
             <x:inputC name="ekgrp" label="默认采购组" labelCol="1" fieldCol="2"/>
             <x:inputC name="mprof" label="MPN参数" labelCol="1" fieldCol="2"/>
         </div>
-        <div class="hg-form-row box">
+    </div>
+    <div class="hg-form-cols" style="display: none">
+        <div class="hg-form-row">
             <x:inputC name="werksPurch" label="工厂" labelCol="1" fieldCol="2"/>
             <x:inputC name="lgort" label="库存地点" labelCol="1" fieldCol="2"/>
             <x:inputC name="disgr" label="MRP组" labelCol="1" fieldCol="2"/>
@@ -155,14 +166,20 @@
             <x:inputC name="sfcpf" label="生产计划参数文件" labelCol="1" fieldCol="2"/>
             <x:inputC name="insmk" label="过账到质检" labelCol="1" fieldCol="2"/>
         </div>
-        <div class="hg-form-row box">
+    </div>
+
+    <div class="hg-form-cols" style="display: none">
+        <div class="hg-form-row">
             <x:inputC name="werksQm" label="工厂" labelCol="1" fieldCol="2"/>
             <x:inputC name="lgortQm" label="库存地点" labelCol="1" fieldCol="2"/>
             <x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>
             <x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/>
             <x:inputC name="prctr" label="利润中心" labelCol="1" fieldCol="2"/>
         </div>
-        <div class="hg-form-row box">
+    </div>
+
+    <div class="hg-form-cols" style="display: none">
+        <div class="hg-form-row">
             <x:inputC name="werksProfit" label="工厂" labelCol="1" fieldCol="2"/>
             <x:inputC name="lgortProfit" label="库存地点" labelCol="1" fieldCol="2"/>
             <x:inputC name="lgnum" label="仓库号" labelCol="1" fieldCol="2"/>
@@ -174,8 +191,11 @@
             <x:inputC name="lhme1" label="仓库设施1存储单位" labelCol="1" fieldCol="2"/>
             <x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="2"/>
         </div>
-        <div class="hg-form-row box">
+    </div>
 
+
+    <div class="hg-form-cols" style="display: none">
+        <div class="hg-form-row">
             <x:inputC name="werksDoc" label="工厂（文档要求）" labelCol="1" fieldCol="2"/>
             <x:inputC name="kzdkz" label="文档要求" labelCol="1" fieldCol="2"/>
             <x:inputC name="art" label="检验类型" labelCol="1" fieldCol="2"/>
@@ -187,8 +207,11 @@
             <x:inputC name="mer" label="检查特性" labelCol="1" fieldCol="2"/>
             <x:inputC name="dyn" label="允许略过" labelCol="1" fieldCol="2"/>
         </div>
-        <div class="hg-form-row box">
+    </div>
 
+
+    <div class="hg-form-cols" style="display: none">
+        <div class="hg-form-row">
             <x:inputC name="bwkey" label="工厂" labelCol="1" fieldCol="2"/>
             <x:inputC name="bklas" label="评估分类" labelCol="1" fieldCol="2"/>
             <x:inputC name="mlast" label="价格确定" labelCol="1" fieldCol="2"/>

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/SapPurchaseItemApplication.java

@@ -18,4 +18,6 @@ public interface SapPurchaseItemApplication {
     Map<String,Object> querySapPurchaseItems(SapPurchaseItemQueryRequest queryRequest);
 
     void deleteByIds(List<String> ids);
+
+    List<SapPurchaseItem> findBySapPurchaseId(String sapPurchaseId);
 }

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseApplicationImpl.java

 package com.huigou.topsun.sap.purchase.application.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.sap.purchase.application.SapPurchaseApplication;
@@ -7,6 +10,7 @@ import com.huigou.topsun.sap.purchase.application.SapPurchaseItemApplication;
 import com.huigou.topsun.sap.purchase.domain.SapPurchase;
 import com.huigou.topsun.sap.purchase.domain.SapPurchaseItem;
 import com.huigou.topsun.sap.purchase.domain.query.SapPurchaseQueryRequest;
+import com.huigou.topsun.sap.purchase.domain.vo.SapPurchaseVo;
 import com.huigou.topsun.sap.purchase.repository.SapPurchaseRepository;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bpm.FlowBroker;
@@ -16,6 +20,7 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -42,6 +47,8 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
         sapPurchase = sapPurchaseRepository.save(sapPurchase);
         List<SapPurchaseItem> sapPurchaseItems = getBizEntities(SapPurchaseItem.class, "sapPurchaseItems");
         sapPurchaseItemApplication.saveSapPurchaseItems(sapPurchase.getId(),sapPurchaseItems);
+
+        String sapPurchaseVoJson = this.getSapPurchaseVoJson(sapPurchase);
         return sapPurchase.getId();
     }
 
@@ -63,6 +70,31 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
         sapPurchaseRepository.save(sapPurchase);
     }
 
+    /**
+     * 转换成SAP JSON格式数据
+     * @param sapPurchase
+     * @return
+     */
+    public String getSapPurchaseVoJson(SapPurchase sapPurchase){
+        List<SapPurchaseItem> sapPurchaseItemList = this.sapPurchaseItemApplication.findBySapPurchaseId(sapPurchase.getId());
+        List<SapPurchaseVo> sapPurchaseVoList = new ArrayList<>();
+        sapPurchaseItemList.forEach(sapPurchaseItem -> {
+            SapPurchaseVo sapPurchaseVo = new SapPurchaseVo();
+            BeanUtil.copyProperties(sapPurchaseItem,sapPurchaseVo);
+            sapPurchaseVo.setBillCode(sapPurchase.getBillCode());
+            sapPurchaseVo.setBsart(sapPurchase.getBsart());
+            sapPurchaseVoList.add(sapPurchaseVo);
+        });
+        ObjectMapper objectMapper = new ObjectMapper();
+        String returnJson = null;
+        try {
+            returnJson = objectMapper.writeValueAsString(sapPurchaseVoList);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+        return returnJson;
+    }
+
     @Override
     protected void onAbortProcessInstance(DelegateExecution delegateExecution) {
         super.onAbortProcessInstance(delegateExecution);

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseItemApplicationImpl.java

@@ -50,4 +50,9 @@ public class SapPurchaseItemApplicationImpl extends BaseApplication implements S
             sapPurchaseItemRepository.delete(id);
         });
     }
+
+    @Override
+    public List<SapPurchaseItem> findBySapPurchaseId(String sapPurchaseId) {
+        return sapPurchaseItemRepository.findBySapPurchaseId(sapPurchaseId);
+    }
 }

topsun/src/main/java/com/huigou/topsun/sap/purchase/domain/vo/SapPurchaseVo.java

+package com.huigou.topsun.sap.purchase.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Auther: xin.lu
+ * @Date: 2024/01/02/14:07
+ * @Description:
+ */
+
+public class SapPurchaseVo implements Serializable {
+    /**
+     * 需求跟踪号
+     */
+    @JsonProperty("BEDNR")
+    private String billCode;
+    /**
+     * pr类型
+     */
+    @JsonProperty("BSART")
+    private String bsart;
+
+    /**
+     * 采购申请编号
+     */
+    @JsonProperty("BANFN")
+    private String banfn;
+
+    /**
+     * 申购项次号
+     */
+    @JsonProperty("BNFPO")
+    private Integer bnfpo;
+
+    /**
+     * 项次类别
+     */
+    @JsonProperty("PSTYP")
+    private String pstyp;
+
+    /**
+     * 科目分配类别
+     */
+    @JsonProperty("KNTTP")
+    private String knttp;
+
+    /**
+     * 工厂
+     */
+    @JsonProperty("WERKS")
+    private String werks;
+
+    /**
+     * 工厂名称
+     */
+    @JsonProperty("NAME1")
+    private String name1;
+
+    /**
+     * 库存地点
+     */
+    @JsonProperty("LGORT")
+    private String lgort;
+
+    /**
+     * 库存地点名称
+     */
+    @JsonProperty("LGOBE")
+    private String lgobe;
+
+    /**
+     * 物料编号
+     */
+    @JsonProperty("MATNR")
+    private String matnr;
+
+    /**
+     * 短文本
+     */
+    @JsonProperty("TXZ01")
+    private String txz01;
+
+    /**
+     * 物料组
+     */
+    @JsonProperty("MATKL")
+    private String matkl;
+
+    /**
+     * 申购数量
+     */
+    @JsonProperty("MENGE")
+    private BigDecimal menge;
+
+    /**
+     * 申购数量单位
+     */
+    @JsonProperty("MEINS")
+    private String meins;
+
+    /**
+     * 采购组
+     */
+    @JsonProperty("EKGRP")
+    private String ekgrp;
+
+    /**
+     * 申请日期
+     */
+    @JsonProperty("BADAT")
+    private Date badat;
+
+    /**
+     * 创建日期
+     */
+    @JsonProperty("ERDAT")
+    private Date erdat;
+
+    /**
+     * 批准日期
+     */
+    @JsonProperty("FRGDT")
+    private Date frgdt;
+
+    /**
+     * 要求交货日期
+     */
+    @JsonProperty("LFDAT")
+    private Date lfdat;
+
+    /**
+     * 服务主数据编号
+     */
+    @JsonProperty("SRVPOS")
+    private String srvpos;
+
+    /**
+     * 服务短文本
+     */
+    @JsonProperty("KTEXT1")
+    private String ktext1;
+
+    /**
+     * 服务条目数量
+     */
+    @JsonProperty("ESLL_MENGE")
+    private BigDecimal esllMenge;
+
+    /**
+     * 服务计量单位
+     */
+    @JsonProperty("ESLL_MEINS")
+    private String esllMeins;
+
+    /**
+     * 定价基数
+     */
+    @JsonProperty("PEINH")
+    private Integer peinh;
+
+    /**
+     * 服务预估单价
+     */
+    @JsonProperty("BRTWR")
+    private BigDecimal brtwr;
+
+    /**
+     * 服务预估金额
+     */
+    @JsonProperty("NETWR")
+    private BigDecimal netwr;
+
+    /**
+     * 创建者
+     */
+    @JsonProperty("ERNAM")
+    private String ernam;
+
+    /**
+     * 申请人
+     */
+    @JsonProperty("AFNAM")
+    private String afnam;
+
+    /**
+     * 评估价格
+     */
+    @JsonProperty("PREIS")
+    private BigDecimal preis;
+
+    /**
+     * 价格基数
+     */
+    @JsonProperty("EBAN_PEINH")
+    private Integer ebanPeinh;
+
+    /**
+     * 币种
+     */
+    @JsonProperty("WAERS")
+    private String waers;
+
+    /**
+     * 评估金额
+     */
+    @JsonProperty("EBAN_NETWR")
+    private BigDecimal ebanNetwr;
+
+    /**
+     * 会计分配序号
+     */
+    @JsonProperty("ZEBKN")
+    private Integer zebkn;
+
+    /**
+     * 多重科目分配
+     */
+    @JsonProperty("VRTKZ")
+    private String vrtkz;
+
+    /**
+     * 部分发票
+     */
+    @JsonProperty("TWRKZ")
+    private String twrkz;
+
+    /**
+     * PR分解数量
+     */
+    @JsonProperty("EKBN_MENGE")
+    private Long ekbnMenge;
+
+    /**
+     * 总账科目
+     */
+    @JsonProperty("SAKTO")
+    private String sakto;
+
+    /**
+     * 成本中心
+     */
+    @JsonProperty("KOSTL")
+    private String kostl;
+
+    /**
+     * 订单号
+     */
+    @JsonProperty("AUFNR")
+    private String aufnr;
+
+    /**
+     * 主资产号
+     */
+    @JsonProperty("ANLN1")
+    private String anln1;
+
+    /**
+     * 子资产号
+     */
+    @JsonProperty("ANLN2")
+    private String anln2;
+
+    /**
+     * 审批处理状态
+     */
+    @JsonProperty("BANPR")
+    private String banpr;
+
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+
+    public void setBsart(String bsart) {
+        this.bsart = bsart;
+    }
+
+    public void setBanfn(String banfn) {
+        this.banfn = banfn;
+    }
+
+    public void setBnfpo(Integer bnfpo) {
+        this.bnfpo = bnfpo;
+    }
+
+    public void setPstyp(String pstyp) {
+        this.pstyp = pstyp;
+    }
+
+    public void setKnttp(String knttp) {
+        this.knttp = knttp;
+    }
+
+    public void setWerks(String werks) {
+        this.werks = werks;
+    }
+
+    public void setName1(String name1) {
+        this.name1 = name1;
+    }
+
+    public void setLgort(String lgort) {
+        this.lgort = lgort;
+    }
+
+    public void setLgobe(String lgobe) {
+        this.lgobe = lgobe;
+    }
+
+    public void setMatnr(String matnr) {
+        this.matnr = matnr;
+    }
+
+    public void setTxz01(String txz01) {
+        this.txz01 = txz01;
+    }
+
+    public void setMatkl(String matkl) {
+        this.matkl = matkl;
+    }
+
+    public void setMenge(BigDecimal menge) {
+        this.menge = menge;
+    }
+
+    public void setMeins(String meins) {
+        this.meins = meins;
+    }
+
+    public void setEkgrp(String ekgrp) {
+        this.ekgrp = ekgrp;
+    }
+
+    public void setBadat(Date badat) {
+        this.badat = badat;
+    }
+
+    public void setErdat(Date erdat) {
+        this.erdat = erdat;
+    }
+
+    public void setFrgdt(Date frgdt) {
+        this.frgdt = frgdt;
+    }
+
+    public void setLfdat(Date lfdat) {
+        this.lfdat = lfdat;
+    }
+
+    public void setSrvpos(String srvpos) {
+        this.srvpos = srvpos;
+    }
+
+    public void setKtext1(String ktext1) {
+        this.ktext1 = ktext1;
+    }
+
+    public void setEsllMenge(BigDecimal esllMenge) {
+        this.esllMenge = esllMenge;
+    }
+
+    public void setEsllMeins(String esllMeins) {
+        this.esllMeins = esllMeins;
+    }
+
+    public void setPeinh(Integer peinh) {
+        this.peinh = peinh;
+    }
+
+    public void setBrtwr(BigDecimal brtwr) {
+        this.brtwr = brtwr;
+    }
+
+    public void setNetwr(BigDecimal netwr) {
+        this.netwr = netwr;
+    }
+
+    public void setErnam(String ernam) {
+        this.ernam = ernam;
+    }
+
+    public void setAfnam(String afnam) {
+        this.afnam = afnam;
+    }
+
+    public void setPreis(BigDecimal preis) {
+        this.preis = preis;
+    }
+
+    public void setEbanPeinh(Integer ebanPeinh) {
+        this.ebanPeinh = ebanPeinh;
+    }
+
+    public void setWaers(String waers) {
+        this.waers = waers;
+    }
+
+    public void setEbanNetwr(BigDecimal ebanNetwr) {
+        this.ebanNetwr = ebanNetwr;
+    }
+
+    public void setZebkn(Integer zebkn) {
+        this.zebkn = zebkn;
+    }
+
+    public void setVrtkz(String vrtkz) {
+        this.vrtkz = vrtkz;
+    }
+
+    public void setTwrkz(String twrkz) {
+        this.twrkz = twrkz;
+    }
+
+    public void setEkbnMenge(Long ekbnMenge) {
+        this.ekbnMenge = ekbnMenge;
+    }
+
+    public void setSakto(String sakto) {
+        this.sakto = sakto;
+    }
+
+    public void setKostl(String kostl) {
+        this.kostl = kostl;
+    }
+
+    public void setAufnr(String aufnr) {
+        this.aufnr = aufnr;
+    }
+
+    public void setAnln1(String anln1) {
+        this.anln1 = anln1;
+    }
+
+    public void setAnln2(String anln2) {
+        this.anln2 = anln2;
+    }
+
+    public void setBanpr(String banpr) {
+        this.banpr = banpr;
+    }
+}

topsun/src/main/java/com/huigou/topsun/sap/purchase/repository/SapPurchaseItemRepository.java

@@ -14,4 +14,6 @@ import java.util.List;
 public interface SapPurchaseItemRepository extends JpaRepository<SapPurchaseItem,String> {
 
     //List<SapPurchaseItem> findBySapPurchase_bsart(String bsart);
+
+    List<SapPurchaseItem> findBySapPurchaseId(String sapPurchaseId);
 }