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

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto072/ErpSubmit072ReqDTO.java

@@ -0,0 +1,20 @@
+package com.zt.plat.module.erp.api.dto.dto072;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Schema(description = "RPC 服务 - 提交 ERP 072 接口请求参数DTO对象")
+@Data
+public class ErpSubmit072ReqDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "072 接口请求参数Head对象")
+    private Header072 head;
+
+    @Schema(description = "072 接口请求参数列表对象")
+    private List<ItemList072> item;
+
+}

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto072/Header072.java

@@ -0,0 +1,29 @@
+package com.zt.plat.module.erp.api.dto.dto072;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Schema(description = "072 接口请求参数Head对象")
+@Data
+public class Header072 implements Serializable {
+    @Schema(description = "过账日期(格式yyyyMMdd)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String pstng_date;
+
+    @Schema(description = "凭证日期(格式yyyyMMdd)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String doc_date;
+
+    @Schema(description = "抬头文本")
+    private String header_txt;
+
+    @Schema(description = "财辅参考(会写入到对应会计凭证的成本分录上)")
+    private String zzcfck;
+
+    @Schema(description = "分配(会写入到对应会计凭证的成本分录上)")
+    private String zuonr;
+
+
+
+
+}

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/dto072/ItemList072.java

@@ -0,0 +1,72 @@
+package com.zt.plat.module.erp.api.dto.dto072;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Schema(description = "072 接口请求参数列表对象")
+@Data
+public class ItemList072 implements Serializable {
+    @Schema(description = "物料号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String material;
+
+    @Schema(description = "工厂编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String plant;
+
+    @Schema(description = "仓库编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String stge_loc;
+
+    @Schema(description = "移动类型", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String move_type;
+
+    @Schema(description = "特殊库存标识")
+    private String spec_stock;
+
+    @Schema(description = "批次")
+    private String batch;
+
+    @Schema(description = "数量(可以为负数)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private BigDecimal entry_qnt;
+
+    @Schema(description = "计量单位(必须等于基本计量单位)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String entry_uom;
+
+    @Schema(description = "目的物料号")
+    private String move_mat;
+
+    @Schema(description = "目的工厂(移库时必填)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String move_plant;
+
+    @Schema(description = "目的仓库(移库时必填)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String move_stloc;
+
+    @Schema(description = "供应商编号(移动类型为541/542时必填)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String vendor;
+
+    @Schema(description = "采购订单号(采购订单收货时需要)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String po_number;
+
+    @Schema(description = "采购订单行号(采购订单收货时需要)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer po_item;
+
+    @Schema(description = "行项目文本(会拼接物料名称放入对应会计凭证的行项目文本)")
+    private String item_text;
+
+    @Schema(description = "资产卡片号")
+    private String asset_no;
+
+    @Schema(description = "资产子编号")
+    private String sub_number;
+
+    @Schema(description = "参考凭证的年度(冲回时使用)")
+    private Integer ref_doc_yr;
+
+    @Schema(description = "参考凭证编号(冲回时使用)")
+    private String ref_doc;
+
+    @Schema(description = "参考凭证项目(冲回时使用)")
+    private Integer ref_doc_it;
+
+}

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java

@@ -118,7 +118,6 @@ public class ErpConfig {
             requestBody.put("bskey", reqDTO.getBskey());
             requestBody.put("usrid", reqDTO.getUsrid());
             requestBody.put("usrnm", reqDTO.getUsrnm());
-            // todo 密码另行约定
             if (StringUtils.isBlank(reqDTO.getSign())) {
                 requestBody.put("sign", DigestUtil.md5Hex(uuid + srcsys + secretKey, StandardCharsets.UTF_8));
             } else {