changhaoning 1 год назад
Родитель
Сommit
a7218f6c7d

+ 4 - 0
src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -1373,6 +1373,10 @@ public class Constant {
         UNIT("dkic_b", "t_mst_unit"),
         // 市场活动
         ACTIVITY("dkic_a", "t_mst_activity"),
+        //仓库
+        WAREHOUSE("dkic_b", "t_mst_warehouse"),
+        // 打印模板
+        PRINT_LAYOUT("dkic_b", "t_mst_print_layout"),
         // 角色
         ROLE("dkic_m", "t_mst_role");
 

+ 2 - 0
src/main/java/com/dk/common/infrastructure/enums/ErrorCodeEnum.java

@@ -79,6 +79,8 @@ public enum ErrorCodeEnum {
     DETAIL_ITEM_ID_IS_NULL(11099,"当前数据中存在明细id为空的数据!"),
     INVENTORY_QUANTITY_HAS_EXCEEDED(11100,"库存数量已超出!"),
 
+    LAYOUT_NAME_EXISTS(4001, "票据名称已存在"),
+
 
     CUSTOMER_FOLLOW_MEASURE_STATUS_DONE(8007, "当前预约量尺已填写回执"),
     SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE(11110, "系统预制数据,无法操作"),

+ 3 - 1
src/main/java/com/dk/common/util/HaipHttpUtils.java

@@ -114,7 +114,9 @@ public class HaipHttpUtils {
         HttpHeaders headers = getHeader();
         // 发送请求《body请求》
         HttpEntity<Object> httpEntity = new HttpEntity<>(params, headers);
-        ResponseEntity<JSONObject> responseEntity = restTemplate.exchange(companyLink.getLinkIp() + requestUrl, HttpMethod.POST, httpEntity, JSONObject.class);
+        //TODO 原来是这样的调用需要改下面那样
+        //ResponseEntity<JSONObject> responseEntity = restTemplate.exchange(companyLink.getLinkIp() + requestUrl, HttpMethod.POST, httpEntity, JSONObject.class);
+        ResponseEntity<JSONObject> responseEntity = restTemplate.exchange(requestUrl, HttpMethod.POST, httpEntity, JSONObject.class);
         return responseEntity.getBody();
     }