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

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java

@@ -18,7 +18,7 @@ import java.util.Set;
 /**
  * bms财务结算系统feign调用接口
  */
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE,url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface BmsServiceFeign {
 
 
@@ -35,6 +35,13 @@ public interface BmsServiceFeign {
     @GetMapping("/settlementCustomersApi/getInfoByCode")
     public AjaxResult getCustomersInfoByCode(@RequestParam("settlementCustomersCode")String settlementCustomersCode);
 
+    /**
+     * 按结算主体ID（如货主ID，对应 settlement_customers.settlement_entity_id）查询结算对象
+     */
+    @GetMapping("/settlementCustomersApi/getInfoBySettlementEntityId")
+    AjaxResult getCustomersInfoBySettlementEntityId(@RequestParam("settlementEntityId") Long settlementEntityId,
+                                                    @RequestParam(value = "topOrganizationId", required = false) Long topOrganizationId);
+
 
     /**
      * 推送同步业务单据

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteBmsFeignFallbackFactory.java

@@ -42,6 +42,11 @@ public class RemoteBmsFeignFallbackFactory implements FallbackFactory<BmsService
                 return AjaxResult.error(throwable.getMessage());
             }
 
+            @Override
+            public AjaxResult getCustomersInfoBySettlementEntityId(Long settlementEntityId, Long topOrganizationId) {
+                return AjaxResult.error(throwable.getMessage());
+            }
+
             @Override
             public AjaxResult pushSyncData(BusinessDataPushDTO businessDataPushDTO) {
                 return AjaxResult.error(throwable.getMessage());

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java

@@ -275,64 +275,16 @@ public class ContractManageApplicationService {
                 .eq(ContractManage::getTopOrganizationId, topOrganizationId)
                 .eq(ContractManage::getCommonContractFlag, 2));
         if (UserContractManages != null && UserContractManages.size() > 0) {
-        }else{
+            //用户合同计费策略
+            calucateSubjectAndPriceStrategy(UserContractManages, organizationId, topOrganizationId, sunjectCode, result);
+        } else {
+            //通用合同计费策略
             List<ContractManage> commonContractManages = contractManageMapper.selectList(new LambdaQueryWrapper<ContractManage>()
                     .eq(ContractManage::getDelFlag, 1)
                     .eq(ContractManage::getOrganizationId, organizationId)
                     .eq(ContractManage::getTopOrganizationId, topOrganizationId)
                     .eq(ContractManage::getCommonContractFlag, 1));
-            if (commonContractManages != null && commonContractManages.size() > 0) {
+            calucateSubjectAndPriceStrategy(commonContractManages, organizationId, topOrganizationId, sunjectCode, result);
-                ContractManage contractManage = commonContractManages.get(0);
-                Long contractManageId = contractManage.getContractManageId();
-                List<ContractManageDetail> contractManageDetails = contractManageDetailMapper.selectList(new LambdaQueryWrapper<ContractManageDetail>()
-                        .eq(ContractManageDetail::getContractManageId, contractManageId)
-                        .eq(ContractManageDetail::getDelFlag, 1));
-                if (contractManageDetails != null && contractManageDetails.size() > 0) {
-                    for (ContractManageDetail contractManageDetail : contractManageDetails) {
-                        String code = contractManageDetail.getFirstSubjectCode();
-                        if (sunjectCode.equals(code)) {
-                            Long accountingStrategyId = contractManageDetail.getAccountingStrategyId();
-                            BillingRulesPO billingRule = contractManageDetailMapper.getBillingRules(accountingStrategyId);
-                            if (billingRule != null) {
-                                Long billingRulesId = billingRule.getBillingRulesId();
-                                List<BillingParamsPO> billingParams = contractManageDetailMapper.getBillingParams(billingRulesId);
-                                if (billingParams != null && billingParams.size() > 0) {
-                                    BillingParamsPO billingParam = billingParams.get(0);
-                                    String billingParamsJson = billingParam.getBillingParamsJson();
-                                    String preSetRules = billingParam.getPreSetRules();
-                                    Long billingParamsId = billingParam.getBillingParamsId();
-                                    List<Map<String, Object>> preSetRulesList = JSON.parseObject(preSetRules, new TypeReference<List<Map<String, Object>>>() {});
-                                    List<Map<String, Object>> billingParamsList = JSON.parseObject(billingParamsJson, new TypeReference<List<Map<String, Object>>>() {});
-                                    Map<String, Object> stringObjectMap1 = preSetRulesList.get(0);
-                                    for (Map<String, Object> stringObjectMap : billingParamsList) {
-                                        String fieldsName = (String) stringObjectMap.get("fieldsName");
-                                        String isShow = (String) stringObjectMap.get("isShow");
-                                        String isFee = (String) stringObjectMap.get("isFee");
-                                        String isPush = (String) stringObjectMap.get("isPush");
-                                        if ("1".equals(isFee)) {
-                                            Integer sort = (Integer) stringObjectMap.get("sort");
-                                            String chargingId = (String) stringObjectMap.get("chargingId");
-                                            String fields = (String) stringObjectMap.get("fields");
-                                            String price = (String) stringObjectMap1.get("fields" + sort);
-                                            SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn();
-                                            subjectAndPriceReturn.setName(fieldsName);
-                                            subjectAndPriceReturn.setPrice(new BigDecimal(price));
-                                            subjectAndPriceReturn.setChargingId(chargingId);
-                                            subjectAndPriceReturn.setFields(fields);
-                                            subjectAndPriceReturn.setBillingRulesId(billingRulesId);
-                                            subjectAndPriceReturn.setIsShow(isShow);
-                                            subjectAndPriceReturn.setIsFee(isFee);
-                                            subjectAndPriceReturn.setIsPush(isPush);
-                                            subjectAndPriceReturn.setRulesId(billingParamsId);
-                                            result.add(subjectAndPriceReturn);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
         }
         return result;
     }
@@ -509,12 +461,21 @@ public class ContractManageApplicationService {
                 .eq(ContractManage::getTopOrganizationId, topOrganizationId)
                 .eq(ContractManage::getCommonContractFlag, 2));
         if (UserContractManages != null && UserContractManages.size() > 0) {
+            //用户合同计费策略
+            calucateSubjectStrategy(UserContractManages, organizationId, topOrganizationId, sunjectCode, result);
         }else{
+            //通用合同计费策略
             List<ContractManage> commonContractManages = contractManageMapper.selectList(new LambdaQueryWrapper<ContractManage>()
                     .eq(ContractManage::getDelFlag, 1)
                     .eq(ContractManage::getOrganizationId, organizationId)
                     .eq(ContractManage::getTopOrganizationId, topOrganizationId)
                     .eq(ContractManage::getCommonContractFlag, 1));
+            calucateSubjectStrategy(commonContractManages, organizationId, topOrganizationId, sunjectCode, result);
+        }
+        return result;
+    }
+
+    private void calucateSubjectStrategy(List<ContractManage> commonContractManages, Long organizationId, Long topOrganizationId, String sunjectCode, List<SubjectAndPriceReturn> result) {
         if (commonContractManages != null && commonContractManages.size() > 0) {
             ContractManage contractManage = commonContractManages.get(0);
             Long contractManageId = contractManage.getContractManageId();
@@ -563,9 +524,61 @@ public class ContractManageApplicationService {
             }
         }
     }
-        return result;
-    }
 
+    private void calucateSubjectAndPriceStrategy(List<ContractManage> contractManages, Long organizationId, Long topOrganizationId, String sunjectCode, List<SubjectAndPriceReturn> result) {
+        if (contractManages != null && contractManages.size() > 0) {
+            ContractManage contractManage = contractManages.get(0);
+            Long contractManageId = contractManage.getContractManageId();
+            List<ContractManageDetail> contractManageDetails = contractManageDetailMapper.selectList(new LambdaQueryWrapper<ContractManageDetail>()
+                    .eq(ContractManageDetail::getContractManageId, contractManageId)
+                    .eq(ContractManageDetail::getDelFlag, 1));
+            if (contractManageDetails != null && contractManageDetails.size() > 0) {
+                for (ContractManageDetail contractManageDetail : contractManageDetails) {
+                    String code = contractManageDetail.getFirstSubjectCode();
+                    if (sunjectCode.equals(code)) {
+                        Long accountingStrategyId = contractManageDetail.getAccountingStrategyId();
+                        BillingRulesPO billingRule = contractManageDetailMapper.getBillingRules(accountingStrategyId);
+                        if (billingRule != null) {
+                            Long billingRulesId = billingRule.getBillingRulesId();
+                            List<BillingParamsPO> billingParams = contractManageDetailMapper.getBillingParams(billingRulesId);
+                            if (billingParams != null && billingParams.size() > 0) {
+                                BillingParamsPO billingParam = billingParams.get(0);
+                                String billingParamsJson = billingParam.getBillingParamsJson();
+                                String preSetRules = billingParam.getPreSetRules();
+                                Long billingParamsId = billingParam.getBillingParamsId();
+                                List<Map<String, Object>> preSetRulesList = JSON.parseObject(preSetRules, new TypeReference<List<Map<String, Object>>>() {});
+                                List<Map<String, Object>> billingParamsList = JSON.parseObject(billingParamsJson, new TypeReference<List<Map<String, Object>>>() {});
+                                Map<String, Object> stringObjectMap1 = preSetRulesList.get(0);
+                                for (Map<String, Object> stringObjectMap : billingParamsList) {
+                                    String fieldsName = (String) stringObjectMap.get("fieldsName");
+                                    String isShow = (String) stringObjectMap.get("isShow");
+                                    String isFee = (String) stringObjectMap.get("isFee");
+                                    String isPush = (String) stringObjectMap.get("isPush");
+                                    if ("1".equals(isFee)) {
+                                        Integer sort = (Integer) stringObjectMap.get("sort");
+                                        String chargingId = (String) stringObjectMap.get("chargingId");
+                                        String fields = (String) stringObjectMap.get("fields");
+                                        String price = (String) stringObjectMap1.get("fields" + sort);
+                                        SubjectAndPriceReturn subjectAndPriceReturn = new SubjectAndPriceReturn();
+                                        subjectAndPriceReturn.setName(fieldsName);
+                                        subjectAndPriceReturn.setPrice(new BigDecimal(price));
+                                        subjectAndPriceReturn.setChargingId(chargingId);
+                                        subjectAndPriceReturn.setFields(fields);
+                                        subjectAndPriceReturn.setBillingRulesId(billingRulesId);
+                                        subjectAndPriceReturn.setIsShow(isShow);
+                                        subjectAndPriceReturn.setIsFee(isFee);
+                                        subjectAndPriceReturn.setIsPush(isPush);
+                                        subjectAndPriceReturn.setRulesId(billingParamsId);
+                                        result.add(subjectAndPriceReturn);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * 新增合同管理

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java

@@ -18,9 +18,11 @@ import com.mhd.common.core.enums.DictCode;
 import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
 import com.mhd.common.core.exception.digitalLogisticsException.UserError;
+import com.mhd.common.core.domain.po.SettlementCustomersPO;
 import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.BmsServiceFeign;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.common.core.domain.po.UserPo;
@@ -51,12 +53,15 @@ public class ExpenseAccountApplicationService {
     private ContractManageApplicationService contractManageApplicationService;
     @Autowired
     private SystemServiceFeign systemServiceFeign;
+    @Autowired
+    private BmsServiceFeign bmsServiceFeign;
 
     /**
      * 入库/出库费用登记等场景：按仓储合同「仓库进出仓单」结算行取科目（二级编码优先，否则一级），再关联费用科目主数据。
      * <p>科目范围以合同结算设置为准；若 {@code expenseAccountDO.inOrderDisplay} 或 {@code expenseAccountDO.outOrderDisplay} 非空，
      * 再按主数据「入库单是否固定显示 / 出库单是否固定显示」（0-否 1-是）与入参相等过滤，二者同时传则同时满足（AND）。</p>
      * settlementCustomersCode 不传或为空时使用通用仓储合同。
+     * <p>若 {@code settlementCustomersCode} 为空且 {@code expenseAccountDO.settlementEntityId} 非空，则通过 BMS 按结算主体ID解析结算对象编码后再查合同（编码仍为空则走通用合同）。</p>
      */
     public List<ExpenseAccountPO> queryListFromContractWarehouseInOutSettlement(ExpenseAccountDO expenseAccountDO, String settlementCustomersCode) {
         Long topOrgIdForExpense = expenseAccountDO.getTopOrganizationId();
@@ -66,8 +71,15 @@ public class ExpenseAccountApplicationService {
                 topOrgIdForExpense = lu.getUserPo().getTopOrganizationId();
             }
         }
+        String effectiveSettlementCode = settlementCustomersCode;
+        if (StringUtils.isEmpty(effectiveSettlementCode) && expenseAccountDO.getSettlementEntityId() != null) {
+            effectiveSettlementCode = resolveSettlementCustomersCodeByEntityId(
+                    expenseAccountDO.getSettlementEntityId(), topOrgIdForExpense);
+            log.info("按结算主体ID解析结算对象编码：settlementEntityId={}，解析得到 settlementCustomersCode={}",
+                    expenseAccountDO.getSettlementEntityId(), effectiveSettlementCode);
+        }
         List<String> orderedCodes = contractManageApplicationService.listSecondSubjectCodesBySettlementAndDocumentType(
-                settlementCustomersCode,
+                effectiveSettlementCode,
                 expenseAccountDO.getOrganizationId(),
                 topOrgIdForExpense,
                 ContractManageApplicationService.DOCUMENT_TYPE_CODE_WAREHOUSE_IN_OUT_ORDER);
@@ -92,6 +104,27 @@ public class ExpenseAccountApplicationService {
         return result;
     }
 
+    /**
+     * 通过 BMS 按 settlement_entity_id 取结算对象编码，供合同匹配；失败返回 null（走通用合同）。
+     */
+    private String resolveSettlementCustomersCodeByEntityId(Long settlementEntityId, Long topOrganizationId) {
+        try {
+            AjaxResult ajaxResult = bmsServiceFeign.getCustomersInfoBySettlementEntityId(settlementEntityId, topOrganizationId);
+            if (ajaxResult == null || !"200".equals(String.valueOf(ajaxResult.get("code"))) || ajaxResult.get("data") == null) {
+                log.warn("按 settlementEntityId 查询结算对象未成功：code={}", ajaxResult != null ? ajaxResult.get("code") : null);
+                return null;
+            }
+            SettlementCustomersPO po = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")), SettlementCustomersPO.class);
+            if (po == null || StringUtils.isEmpty(po.getSettlementCustomersCode())) {
+                return null;
+            }
+            return po.getSettlementCustomersCode().trim();
+        } catch (Exception e) {
+            log.warn("按 settlementEntityId 解析结算对象编码异常", e);
+            return null;
+        }
+    }
+
     /**
      * 合同路径下可选：与主数据 in_order_display / out_order_display 一致才保留（入参为 null 的维度不参与过滤）。
      */

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/todo/ExpenseAccountDO.java

@@ -181,4 +181,7 @@ public class ExpenseAccountDO extends BaseVOEntity{
 
     /** 查询参数：结算主体编码（货主编码等） */
     private String settlementCustomersCode;
+
+    /** 查询参数：结算主体ID（货主ID等，对应 settlement_customers.settlement_entity_id） */
+    private Long settlementEntityId;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/expenseAccount/ExpenseAccountDTO.java

@@ -169,4 +169,11 @@ public class ExpenseAccountDTO extends BaseVOEntity{
 
     @ApiModelProperty("结算主体编码（通常为货主编码）；不传则按通用仓储合同的结算设置取科目")
     private String settlementCustomersCode;
+
+    /**
+     * 结算主体ID（货主等业务主体ID，与 BMS settlement_customers.settlement_entity_id 一致）。
+     * 与 settlementCustomersCode 二选一：编码优先；仅传本字段时在 BMS 解析出结算对象编码后再走合同（有客户合同用客户，无则通用）。
+     */
+    @ApiModelProperty("结算主体ID（货主ID等，对应 settlement_entity_id）；与 settlementCustomersCode 二选一，编码优先")
+    private Long settlementEntityId;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java

@@ -53,6 +53,7 @@ public class ExpenseAccountApi extends BaseController{
      *
      * <p>入库/出库费用登记等场景传 {@code contractSettlementQuery=true}（与单据类型「仓库进出仓单」合同结算行一致），
      * 科目来源、结算主体为空走通用合同等逻辑<strong>入库与出库相同</strong>。
+     * 可传 {@code settlementCustomersCode}，或仅传 {@code settlementEntityId}（货主/结算主体ID，对应 BMS settlement_entity_id）由服务端解析结算编码后再匹配合同（有客户合同用客户，无则通用；编码优先）。
      * 先按合同结算行取科目，再关联主数据；若请求中传入 {@code inOrderDisplay} 或 {@code outOrderDisplay}（0-否 1-是），
      * 则再按主数据「入库单 / 出库单是否固定显示」与入参相等过滤（二者都传则同时满足）。不传则不在此维度过滤。</p>
      */
@@ -70,8 +71,9 @@ public class ExpenseAccountApi extends BaseController{
             if (Boolean.TRUE.equals(expenseAccountDTO.getContractSettlementQuery())) {
                 ExpenseAccountDO contractQueryDO = new ExpenseAccountDO();
                 BeanUtils.copyProperties(expenseAccountDTO, contractQueryDO);
-                logger.info("按合同结算设置查询费用科目，settlementCustomersCode={}，inOrderDisplay={}，outOrderDisplay={}",
+                logger.info("按合同结算设置查询费用科目，settlementCustomersCode={}，settlementEntityId={}，inOrderDisplay={}，outOrderDisplay={}",
                         expenseAccountDTO.getSettlementCustomersCode(),
+                        expenseAccountDTO.getSettlementEntityId(),
                         expenseAccountDTO.getInOrderDisplay(), expenseAccountDTO.getOutOrderDisplay());
                 List<ExpenseAccountPO> contractList =
                         expenseAccountApplicationService.queryListFromContractWarehouseInOutSettlement(

mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java

@@ -376,4 +376,39 @@ public class SettlementCustomersApplicationService {
         }
         return null;
     }
+
+    /**
+     * 按结算主体ID（如货主用户ID，对应 settlement_entity_id）取一条结算对象，用于解析合同上的 settlement_customers_code。
+     * 多条时按 settlement_customers_id 升序取第一条。
+     *
+     * @param settlementEntityId 结算主体id，不可为空
+     * @param topOrganizationId  一级组织；为空则从当前登录用户取
+     */
+    public SettlementCustomersPO getFirstBySettlementEntityId(Long settlementEntityId, Long topOrganizationId) {
+        if (settlementEntityId == null) {
+            return null;
+        }
+        Long topOrg = topOrganizationId;
+        if (topOrg == null) {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser != null && loginUser.getUserPo() != null) {
+                topOrg = loginUser.getUserPo().getTopOrganizationId();
+            }
+        }
+        LambdaQueryWrapper<SettlementCustomers> wrapper = new LambdaQueryWrapper<SettlementCustomers>()
+                .eq(SettlementCustomers::getSettlementEntityId, settlementEntityId)
+                .eq(SettlementCustomers::getDelFlag, 1)
+                .orderByAsc(SettlementCustomers::getSettlementCustomersId)
+                .last("LIMIT 1");
+        if (topOrg != null) {
+            wrapper.eq(SettlementCustomers::getTopOrganizationId, topOrg);
+        }
+        SettlementCustomers entity = settlementCustomersMapper.selectOne(wrapper);
+        if (entity == null) {
+            return null;
+        }
+        SettlementCustomersPO po = new SettlementCustomersPO();
+        BeanUtils.copyProperties(entity, po);
+        return po;
+    }
 }

mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/SettlementCustomersApi.java

@@ -123,6 +123,21 @@ public class SettlementCustomersApi extends BaseController{
         return AjaxResult.success(settlementCustomersApplicationService.getInfoByCode(settlementCustomersCode));
     }
 
+    /**
+     * 按结算主体ID（货主等业务主体ID，对应 settlement_entity_id）查询一条结算对象
+     */
+    @ApiOperation("按结算主体ID查询结算对象")
+    @GetMapping(value = "/getInfoBySettlementEntityId")
+    public AjaxResult getInfoBySettlementEntityId(
+            @RequestParam(value = "settlementEntityId", required = false) Long settlementEntityId,
+            @RequestParam(value = "topOrganizationId", required = false) Long topOrganizationId) {
+        if (settlementEntityId == null) {
+            return AjaxResult.error("缺少必传查询参数 settlementEntityId（货主/结算主体ID，对应 settlement_entity_id）。"
+                    + "GET 请求示例：/settlementCustomersApi/getInfoBySettlementEntityId?settlementEntityId=123456&topOrganizationId=你的租户一级组织ID");
+        }
+        return AjaxResult.success(settlementCustomersApplicationService.getFirstBySettlementEntityId(settlementEntityId, topOrganizationId));
+    }
+
 
 
 

mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java

@@ -146,7 +146,9 @@ public class BusinessDocumentOrderApplicationService {
 
     public void reviseApply(BusinessDocumentOrderDTO businessDocumentOrderDTO) {
         BusinessDocumentOrder businessDocumentOrder = new BusinessDocumentOrder();
-        BeanUtils.copyProperties(businessDocumentOrder,businessDocumentOrderDTO);
+        BeanUtils.copyProperties(businessDocumentOrderDTO,businessDocumentOrder);
+        businessDocumentOrder.setReviseApplyTime(new Date());
+        businessDocumentOrder.setReviseApplyStatus(1);
         businessDocumentOrderMapper.updateById(businessDocumentOrder);
 
     }
@@ -199,7 +201,7 @@ public class BusinessDocumentOrderApplicationService {
             GwLog gwLog = new GwLog();
             gwLog.setType("进出口原始单证");
             gwLog.setBusinessId(Long.valueOf(pushData.getId()));
-            gwLog.setRequestBody(JSONObject.toJSONString(body));
+            gwLog.setRequestBody(JSONObject.toJSONString(bodyList));
             gwLog.setResponseBody("");
             gwLog.setStatus(1);
             gwLog.setSendTime(new Date());
@@ -215,7 +217,7 @@ public class BusinessDocumentOrderApplicationService {
             try {
                 CloseableHttpClient httpClient = HttpClients.createDefault();
                 HttpPost httpPost = new HttpPost(PUSH_API_URL);
-                StringEntity postingString = new StringEntity(JSONObject.toJSONString(body), "UTF-8");
+                StringEntity postingString = new StringEntity(JSONObject.toJSONString(bodyList), "UTF-8");
                 httpPost.setEntity(postingString);
 
                 httpPost.setHeader("Content-type", "application/json");

mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java

@@ -73,6 +73,7 @@ public class ErpCountryApplicationService{
             erpCountry.setCreateBy(loginUser.getUserid());
             erpCountry.setOrganizationId(loginUser.getUserPo().getOrganizationId());
             erpCountry.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            erpCountry.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         }
         erpCountry.setCreateTime(new Date());
         return erpCountryMapper.insert(erpCountry);

mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java

@@ -93,6 +93,7 @@ public class ErpEnterpriseUnitApplicationService {
             //erpEnterpriseUnit.setCreateTime(new Date());
             erpEnterpriseUnit.setOrganizationId(loginUser.getUserPo().getOrganizationId());
             erpEnterpriseUnit.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            erpEnterpriseUnit.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         }
         erpEnterpriseUnit.setCreateTime(new Date());
         return erpEnterpriseUnitMapper.insert(erpEnterpriseUnit);

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -800,6 +800,9 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     @ApiModelProperty("商品类型")
     private Integer productType;
 
+    @ApiModelProperty(value = "货物数量")
+    private BigDecimal cargoNum;
+
     @ApiModelProperty("删改单申请类型：0-改单 1-删除 2-作废")
     private Integer reviseApplyType;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/originalImportExportDocument/OrderWithMaterialDTO.java

@@ -782,7 +782,7 @@ public class OrderWithMaterialDTO {
     @ApiModelProperty("仓库负责人电话")
     private String directorPhone;
 
-    @ApiModelProperty("仓库负责人电话")
+    @ApiModelProperty("件数")
     private BigDecimal  CargoNum;
 
     @ApiModelProperty("币制")
@@ -816,4 +816,26 @@ public class OrderWithMaterialDTO {
 
     @ApiModelProperty("商品类型列表")
     private List<Integer> productTypeList;
+
+
+
+    @ApiModelProperty("删改单申请类型：0-改单 1-删除 2-作废")
+    private Integer reviseApplyType;
+
+    @ApiModelProperty("删改单申请状态：0-未申请 1-申请成功 2-申请失败")
+    private Integer reviseApplyStatus;
+
+    @ApiModelProperty("删改单申请人")
+    private String reviseApplyBy;
+
+    @ApiModelProperty("删改单申请人姓名")
+    private String reviseApplyByName;
+
+    @ApiModelProperty("删改单申请原因")
+    private String reviseApplyReason;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("删改单申请时间")
+    private Date reviseApplyTime;
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java

@@ -67,11 +67,11 @@ public class OriginalImportExportDocumentApi extends BaseController {
 
     @ApiOperation("删改单申请")
     @PostMapping("/reviseApply")
-    public AjaxResult reviseApply(@RequestParam BusinessDocumentOrderDTO businessDocumentOrderDTO) {
+    public AjaxResult reviseApply(@RequestBody BusinessDocumentOrderDTO businessDocumentOrderDTO) {
 
         businessDocumentOrderApplicationService.reviseApply(businessDocumentOrderDTO);
 
-        return null;
+        return AjaxResult.success();
     }
 
     @ApiOperation("批量推送")
@@ -103,7 +103,7 @@ public class OriginalImportExportDocumentApi extends BaseController {
         Page<BusinessDocumentOrderPO> page = (Page<BusinessDocumentOrderPO>) orderList;
 
         List<OrderWithMaterialDTO> resultList = convertToOrderWithMaterialList(orderList);
-
+        //return getDataTable(resultList);
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setData(resultList);
         tableDataInfo.setTotal(page.getTotal());

mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml

@@ -181,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reviseApplyByName"    column="REVISE_APPLY_BY_NAME"    />
         <result property="reviseApplyReason"    column="REVISE_APPLY_REASON"    />
         <result property="reviseApplyTime"    column="REVISE_APPLY_TIME"    />
+        <result property="cargoNum"    column="CARGO_NUM"    />
     </resultMap>
 
 
@@ -711,7 +712,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select  SALESPERSON_NC_CODE from NGWL_TEST_USER."USER" where USER_ID = #{salesmanCodeNc}</select>
 
     <select id="queryListAndMaterial" parameterType="com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO" resultMap="BusinessDocumentOrderResult">
-        select o.*,a.material_code , a.material_base_info_id ,a.product_type
+        select o.*,a.material_code , a.material_base_info_id ,a.product_type,a.cargo_num
         from business_document_order as o
         left join business_document_cargo_multi as a ON o.id = a.order_id
 <include refid="selectBusinessDocumentOrderPo3"/>