Merge branch 'dev' into dev_WMS20260401

# Conflicts: # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java # mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java # mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java # mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java # mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/facade/IReceiptMaterialDetailService.java # mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java # mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java # mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/po/StockReceiptOrderPO.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockReceiptOrder/StockReceiptOrderApi.java # mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java # mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml # mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml
2026-04-15 18:48:55 +08:00
parent ad310f2fc2 551c618820
commit 22aef1d84d
79 changed files with 3519 additions and 476 deletions
@@ -99,4 +99,7 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{
    @ApiModelProperty("")
    private String materialCode;

+    @ApiModelProperty("体积")
+    private BigDecimal materialVolume;
+
 }
@@ -4,6 +4,7 @@ import com.mhd.common.core.annotation.Excel;
 import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAddressMulti;
 import com.mhd.oms.domain.businessDocumentAddressMulti.repository.todo.BusinessDocumentAddressMultiDO;
 import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
+import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
 import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
 import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO;
 import lombok.Data;
@@ -753,6 +754,17 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
    @ApiModelProperty(value = "开户银行")
    private String accountBank;

+    @ApiModelProperty(value = "业务主管")
+    private String salesManager;
+    @ApiModelProperty(value = "审核意见")
+    private String reviewOpinion;
+
+    @ApiModelProperty("订单来源")
+    private String orderSource;
+
+    @ApiModelProperty(value = "出入库单号")
+    private String entryNumber;
+
    @ApiModelProperty("业务单地址集合")
    private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;

@@ -769,4 +781,7 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
    @ApiModelProperty(value = "卸货地址集合")
    private List<BusinessDocumentAddressMultiDTO> unloadAddressList;

+    @ApiModelProperty("费用科目明细")
+    private List<BusinessOrderAccount> businessOrderAccountList;
+
 }
@@ -91,9 +91,41 @@ public class ExecuteOrderDTO extends BaseVOEntity{
    private Long topOrganizationId;


+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String vehicleTypeName;
+
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long orderShippingType;
+
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String appointShipper;
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String unloadName;
+
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String loadingName;
+
+    @ApiModelProperty("业务单号")
+    private String  businessOrderNumber;
+
+
    @ApiModelProperty(name = "组织ID集合")
    private List<Long> organizationIdList;

    @ApiModelProperty(name = "权限菜单ID")
    private Long permissionMenuId;
+
+    @ApiModelProperty("作业情况")
+    private String  jobStatus;
+
+    @ApiModelProperty("预计运输时间")
+    private Date  documentDate;
+
+    @ApiModelProperty("备注")
+    private String  shippingNote;
 }
@@ -64,6 +64,13 @@ public class BusinessDocumentOrderApi extends BaseController{
        }
    }

+    @ApiOperation("根据业务单id查询费用明细")
+    @GetMapping("/getFeeDetail/{id}")
+    public AjaxResult getFeeDetail(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(businessDocumentOrderApplicationService.getFeeDetail(id));
+    }
+
    /**
     * 批量删除【业务单】
     */
@@ -89,9 +96,9 @@ public class BusinessDocumentOrderApi extends BaseController{
     */
    @ApiOperation("业务单审核")
    @GetMapping(value = "/audit")
-    public AjaxResult audit(@RequestParam("ids") Long[] ids,@RequestParam("reviewStatus") Long reviewStatus)
+    public AjaxResult audit(@RequestParam("ids") Long[] ids,@RequestParam("reviewStatus") Long reviewStatus,@RequestParam("salesManager") String salesManager,@RequestParam("reviewOpinion") String reviewOpinion)
    {
-        return AjaxResult.success(businessDocumentOrderApplicationService.audit(ids,reviewStatus));
+        return AjaxResult.success(businessDocumentOrderApplicationService.audit(ids,reviewStatus,salesManager,reviewOpinion));
    }

    /**
@@ -103,6 +110,12 @@ public class BusinessDocumentOrderApi extends BaseController{
    {
        return toAjax(businessDocumentOrderApplicationService.execute(ids));
    }
+    @ApiOperation("获取业务单的货物内容")
+    @GetMapping("/getCargoContent/{id}")
+    public AjaxResult getCargoContent(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(businessDocumentOrderApplicationService.getCargoContent(id));
+    }



@@ -2,6 +2,8 @@ package com.mhd.oms.interfaces.facade.executeOrder;

 import java.util.List;

+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -103,6 +105,15 @@ public class ExecuteOrderApi extends BaseController{
        return toAjax(executeOrderApplicationService.cancelIssueDocuments(ids));
    }

+    @ApiOperation("获取当前登录人信息")
+    @GetMapping("/getCurrentUser")
+    public LoginUser getCurrentUser()
+    {
+        LoginUser u = SecurityUtils.getLoginUser();
+//        u.getUserPo().getUserName();
+        return u;
+    }
+