pom，工艺路线，封装post提交asp

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java

@@ -11,6 +11,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.HashMap;
+
 @FeignClient(name = ApiConstants.NAME)
 @Tag(name = "RPC 服务 - ERP")
 public interface ErpExternalApi {
@@ -19,6 +21,6 @@ public interface ErpExternalApi {
 
     @PostMapping(PREFIX + "/submit")
     @Operation(summary = "erp数据提交")
-    ResponseEntity<String> submitDataToErp(@Valid @RequestBody ErpSubmitReqDTO reqDTO);
+    HashMap<String, String> submitDataToErp(@Valid @RequestBody ErpSubmitReqDTO reqDTO);
 
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java

@@ -7,6 +7,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+
 /**
  * ERP  Api 实现类
  *
@@ -21,7 +23,7 @@ public class ErpExternalApiImpl implements ErpExternalApi {
     private ErpConfig erpConfig;
 
     @Override
-    public ResponseEntity<String> submitDataToErp(ErpSubmitReqDTO reqDTO) {
+    public HashMap<String, String> submitDataToErp(ErpSubmitReqDTO reqDTO) {
         return erpConfig.pushDataToErp(reqDTO);
     }
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpAssetController.java

@@ -104,7 +104,7 @@ public class ErpAssetController {
     @PostMapping("/getErpAssetTask")
     @Operation(summary = "定时获得erp更新资产卡片")
     @PreAuthorize("@ss.hasPermission('sply:erp-asset:create')")
-    public CommonResult<Boolean> getErpCompanyTask() {
+    public CommonResult<Boolean> getErpAssetTask() {
         erpAssetService.callErpRfcInterface();
         return success(true);
     }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessPageReqVO.java

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 public class ErpProcessPageReqVO extends PageParam {
 
     @Schema(description = "工厂编码")
-    private BigDecimal factoryNumber;
+    private String factoryNumber;
 
     @Schema(description = "物料编码")
     private String materialNumber;

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessRespVO.java

@@ -18,7 +18,7 @@ public class ErpProcessRespVO {
 
     @Schema(description = "工厂编码", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("工厂编码")
-    private BigDecimal factoryNumber;
+    private String factoryNumber;
 
     @Schema(description = "物料编码", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("物料编码")

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessSaveReqVO.java

@@ -16,7 +16,7 @@ public class ErpProcessSaveReqVO {
 
     @Schema(description = "工厂编码", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "工厂编码不能为空")
-    private BigDecimal factoryNumber;
+    private String factoryNumber;
 
     @Schema(description = "物料编码", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "物料编码不能为空")

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpProcessDO.java

@@ -34,7 +34,7 @@ public class ErpProcessDO {
     * 工厂编码
     */
     @TableField("FACT_NUM")
-    private BigDecimal factoryNumber;
+    private String factoryNumber;
     /**
     * 物料编码
     */
@@ -63,7 +63,7 @@ public class ErpProcessDO {
     /**
     * 计量单位
     */
-    @TableField("UOM")
+    @TableField("UNT")
     private String uom;
     /**
     * 用途

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpProcessDetailDO.java

@@ -48,7 +48,7 @@ public class ErpProcessDetailDO {
     /**
     * 作业的计量单位
     */
-    @TableField("UOM")
+    @TableField("UNT")
     private String uom;
     /**
     * 工作中心编号

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpBomServiceImpl.java

@@ -312,8 +312,8 @@ public class ErpBomServiceImpl implements ErpBomService {
         items.add(item);
         req.put("item", items);
         reqDTO.setReq(req);
-        ResponseEntity<String> response = erpExternalApi.submitDataToErp(reqDTO);
-        if (response.getStatusCode() == HttpStatus.OK) {
+        HashMap<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
+        if (response.get("result").isEmpty()) {
             log.info("ERP数据提交成功");
         }
     }