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

topsun-xt/src/main/webapp/biz/topsun/common/listeningFromData.js

@@ -370,8 +370,10 @@ function checkUpdata() {
     let rawData = dataSet.rawData, newData = dataSet.newData;
     window.dataSet.upData = {};
     let rawEntry = Object.entries(rawData);
+    debugger;
     tryForEach(rawEntry, entry => {
         let beanName = entry[0];
+        console.log(beanName);
         let mapping = window.dataMapping[beanName], raw = rawData[beanName], now = newData[beanName];
         if(mapping instanceof Array) {
             // Form 时 执行此逻辑
@@ -382,7 +384,10 @@ function checkUpdata() {
         } else if (mapping instanceof Object) {
             // Grid 时 执行此逻辑
             let rawCompares = raw.compares, nowCompares = now.compares;
+            if(!rawCompares) { rawCompares = {}; }
+            if(!nowCompares) { nowCompares = {}; }
             if(!(getHashCode(JSON.stringify(rawCompares)) === getHashCode(JSON.stringify(nowCompares)))) {
+                debugger;
                 let rawIds = raw.ids, nowIds = now.ids;
                 dataSet.upData[beanName] = {};
                 dataSet.upData[beanName].del = [];

topsun/src/main/java/com/huigou/topsun/sap/costCenter/domain/CostCenter.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * @Date: 2023/12/13/10:42
  * @Description:
  */
-@Table(name="cost_center")
+@Table(name="sap_cost_center")
 @Entity
 @Data
 public class CostCenter extends AbstractEntity {

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/SapFixedAssetsApplication.java

+package com.huigou.topsun.sap.fixedAssets.application;
+
+/**
+ * @Auther: xin.lu
+ * @Date: 2023/12/21/9:37
+ * @Description:
+ */
+public interface SapFixedAssetsApplication {
+}

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssetsApplicationImpl.java

+package com.huigou.topsun.sap.fixedAssets.application.impl;
+
+import com.huigou.topsun.sap.fixedAssets.application.SapFixedAssetsApplication;
+import com.huigou.uasp.bpm.FlowBroker;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Auther: xin.lu
+ * @Date: 2023/12/21/9:37
+ * @Description:
+ */
+@Service("sapFixedAssetsApplication")
+public class SapFixedAssetsApplicationImpl extends FlowBroker implements SapFixedAssetsApplication {
+}

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/controller/SapFixedAssetsController.java

+package com.huigou.topsun.sap.fixedAssets.controller;
+
+import com.huigou.uasp.annotation.ControllerMapping;
+import com.huigou.uasp.client.CommonController;
+import org.springframework.stereotype.Controller;
+
+/**
+ * @Auther: xin.lu
+ * @Date: 2023/12/21/9:44
+ * @Description:
+ */
+@Controller
+@ControllerMapping("/sapFixedAssets")
+public class SapFixedAssetsController extends CommonController {
+}

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/SapFixedAssets.java

+package com.huigou.topsun.sap.fixedAssets.domain;
+
+import java.math.BigDecimal;
+import javax.persistence.*;
+
+import com.huigou.data.domain.model.FlowBillAbstractEntity;
+import lombok.Data;
+
+/**
+ * SAP固定资产主数据
+ * @TableName sap_fixed_assets
+ */
+@Table(name="sap_fixed_assets")
+@Entity
+@Data
+public class SapFixedAssets extends FlowBillAbstractEntity {
+    /**
+     * BPM单号
+
+     */
+    @Column(name = "ZBPMN")
+    private String zbpmn;
+
+    /**
+     * 用于标识数据是新增或修改，1为新增，2为修改。（必填）
+     */
+    @Column(name = "ZFLG")
+    private Integer zflg;
+
+    /**
+     * 主资产号
+;资产编号内部生成，当创建标识为2，即修改时，主资产号为必输。
+     */
+    @Column(name = "ANLN1")
+    private String anln1;
+
+    /**
+     * 当创建标识为1，即创建时，资产分类必输。
+     */
+    @Column(name = "ANLKL")
+    private String anlkl;
+
+    /**
+     * 公司代码（必填）
+     */
+    @Column(name = "BUKRS")
+    private String bukrs;
+
+    /**
+     * 文本（必填）
+     */
+    @Column(name = "TXT50")
+    private String txt50;
+
+    /**
+     * 存货号；存放地点
+     */
+    @Column(name = "INVNR")
+    private String invnr;
+
+    /**
+     * 数量
+     */
+    @Column(name = "MENGE")
+    private BigDecimal menge;
+
+    /**
+     * 基本计量单位
+     */
+    @Column(name = "MEINS")
+    private String meins;
+
+    /**
+     * 成本中心（必填）
+     */
+    @Column(name = "KOSTL")
+    private String kostl;
+
+    /**
+     * 责任成本中心
+     */
+    @Column(name = "KOSTLV")
+    private String kostlv;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    protected String getCodeRuleId() {
+        return "sapFixedAssets";
+    }
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/repository/SapFixedAssetsRepository.java

+package com.huigou.topsun.sap.fixedAssets.repository;
+
+import com.huigou.topsun.sap.fixedAssets.domain.SapFixedAssets;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @Auther: xin.lu
+ * @Date: 2023/12/21/9:43
+ * @Description:
+ */
+public interface SapFixedAssetsRepository extends JpaRepository<SapFixedAssets,String> {
+}