Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-dependency-common

# Conflicts:
#	src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

src/main/java/com/dk/common/feign/BasicServerFeign.java

@@ -43,4 +43,6 @@ public interface BasicServerFeign {
      */
     @PostMapping(Constant.BASIC_COMMON+"send_subscribe_msg")
     ResponseResultVO<Boolean>  sendSubscribeMsg(@RequestBody Map<String, Object> param);
+
+
 }

src/main/java/com/dk/common/feign/MdmServerFeign.java

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.Map;
+
 /**
  * @desc   : MdmServerFeign
  * @author : 洪旭东
@@ -31,4 +33,12 @@ public interface MdmServerFeign {
      */
     @PostMapping({Constant.MST_PRODUCE_ORDER + "/{id}"})
     ResponseResultVO<JSONObject> selectById(@PathVariable Integer id);
+
+    /**
+     * @desc   : 获取系统参数
+     * @author : 洪旭东
+     * @date   : 2023-12-29 10:59
+     */
+    @PostMapping(Constant.MDM_COMMON+"/get_setting_value")
+    ResponseResultVO getSettingValue(@RequestBody Map<String, Object> param);
 }

src/main/java/com/dk/common/feign/SheetServerFeign.java

@@ -0,0 +1,44 @@
+package com.dk.common.feign;
+
+import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.response.ResponseResultVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @desc   : SheetServerFeign
+ * @author : 洪旭东
+ * @date   : 2024-01-03 09:41
+ */
+@FeignClient(name = Constant.SHEET_PREFIX + Constant.SERVER, contextId = "sheet")
+public interface SheetServerFeign {
+
+    /**
+     * @desc   : 新建报工
+     * @author : 洪旭东
+     * @date   : 2024-01-03 09:38
+     */
+    @ApiOperation(
+            value = "新建报工",
+            notes = "新建报工"
+    )
+    @PostMapping(Constant.SHEET_REPORT + "/insert")
+    ResponseResultVO<?> insert(@RequestBody List<Map<String, Object>> sheetDispatchVOList);
+
+    /**
+     * @desc   : 撤销报工
+     * @author : 洪旭东
+     * @date   : 2024-01-03 15:35
+     */
+    @ApiOperation(
+            value = "撤销报工",
+            notes = "撤销报工"
+    )
+    @PostMapping(Constant.SHEET_REPORT + "/report_undo")
+    ResponseResultVO<?> reportUndo(@RequestBody List<Long> pdtUniqueIdList);
+}

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -490,6 +490,9 @@ public class Constant {
 
         SYS_PDM_002("PDM_002"),
 
+        SYS_PDM_006("PDM_006"),
+
+
 
         /**
          * 【系统字典】未出库、出库中、出库完成
@@ -1097,12 +1100,16 @@ public class Constant {
     public static final String REPORT = "/detailReport";
     public static final String MOLDING = "/pdm/molding";
     public static final String COLLECT = "/pdm/collect";
+    public static final String SHEET_PREFIX = "sheet";
+    public static final String SHEET_REPORT = "/sht/sheet_report";
 
 
     public static final String FILE_UPLOAD = "/file";
 
     public static final String API_LOG = "/apm/api_log";
     public static final String BASIC_COMMON = "/basic/common";
+    public static final String MDM_COMMON = "/mst/common";
+
 
     /**
      * @author : 洪旭东

src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -173,6 +173,20 @@ public enum ErrorCodeEnum {
     SHEET_PRODUCE_STATUS_CAN_NOT_RESTART(4134, "非暂停状态工单不可重启"),
     DICTIONARY_DATA_NOT_UPDATE(4135, "共用字典数据不能更新"),
     
+    SHEET_DISPATCH_STATUS_CAN_NOT_PAUSE(4135, "非执行状态派工单不可暂停"),
+    SHEET_DISPATCH_STATUS_CAN_NOT_CANCEL(4136, "当前派工单状态不可取消"),
+    SHEET_DISPATCH_STATUS_CAN_NOT_DELETE(4137, "当前派工单状态不可删除"),
+    SHEET_DISPATCH_STATUS_CAN_NOT_RESTART(4138, "非暂停状态派工单不可重启"),
+    SHEET_DISPATCH_HAD_UPDATE(4139, "派工单数据已被更新，修改失败"),
+    SHEET_PRODUCE_NUM_SMALLER_THAN_DISPATCH_REPORT_NUM(4140, "工单生产数量不可小于派工或报工数量"),
+    SHEET_DISPATCH_NUM_SMALLER_THAN_REPORT_NUM(4141, "派工单派工数量不可小于报工数量"),
+    SHEET_REPORT_NOT_MATCH_DISPATCH(4142, "未找到匹配的派工单，报工失败"),
+    SHEET_REPORT_FAIL_PRODUCE(4143, "报工失败,请检查工单状态"),
+    SHEET_REPORT_FAIL_DISPATCH(4144, "报工失败,请检查派工单状态"),
+    SHEET_REPORT_UNDO_FAIL_PRODUCE(4145, "撤销报工失败,请检查工单状态"),
+    SHEET_REPORT_UNDO_FAIL_DISPATCH(4146, "撤销报工失败,请检查派工单状态"),
+    SHEET_REPORT_UNDO_FAIL(4147, "撤销报工失败"),
+
 
 
     APP_MOLD_LINE_SUCCESS(1, "成功"),

src/main/java/com/dk/common/service/UserService.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @desc : 请求用户服务
  * @date : 2022-06-07 16:03
  */
-@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER )
+@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-jn")
 public interface UserService {
 
     /**