oms修改

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

@@ -1,5 +1,6 @@
 package com.mhd.oms.application.service.businessDocumentOrder;
 
+import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
 import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO;
 import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO;
 import com.mhd.oms.domain.businessDocumentOrder.service.BusinessDocumentOrderDomainService;
@@ -70,9 +71,9 @@ public class BusinessDocumentOrderApplicationService {
         return businessDocumentOrderDomainService.getInfo(id);
     }
 
-    public Boolean audit( Long[] ids, Long reviewStatus)
+    public Boolean audit( Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion)
     {
-        return businessDocumentOrderDomainService.audit(ids,reviewStatus);
+        return businessDocumentOrderDomainService.audit(ids,reviewStatus,SalesManager,reviewOpinion);
     }
     public boolean execute(Long[] ids) {
         return businessDocumentOrderDomainService.execute(ids);
@@ -81,4 +82,7 @@ public class BusinessDocumentOrderApplicationService {
         return businessDocumentOrderDomainService.cancelExecute(ids);
     }
 
+    public BusinessDocumentCargoMulti getCargoContent(Long id) {
+        return businessDocumentOrderDomainService.getCargoContent(id);
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java

@@ -80,6 +80,8 @@ public class BusinessDocumentCargoMulti extends BaseVOEntity{
     private String weightUnitId;
     @ApiModelProperty(value = "重量单位名称")
     private String weightUnit;
+    @ApiModelProperty(value = "体积")
+    private BigDecimal materialVolume;
 
 
     @ApiModelProperty(value = "数量单位ID")

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java

@@ -731,4 +731,10 @@ public class BusinessDocumentOrder extends BaseVOEntity{
 //
 //    @ApiModelProperty(value = "开户银行")
 //    private String accountBank;
+
+    @ApiModelProperty(value = "业务主管")
+    private String salesManager;
+
+    @ApiModelProperty(value = "审核意见")
+    private String reviewOpinion;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java

@@ -45,7 +45,7 @@ public interface IBusinessDocumentOrderService extends IService<BusinessDocument
      */
     public BusinessDocumentOrderPO getInfo(Long id);
 
-    public Boolean audit( Long [] ids, Long reviewStatus);
+    public Boolean audit( Long [] ids, Long reviewStatus, String SalesManager,String reviewOpinion);
 
     String selectByMakerCodeNc(String salesmanCodeNc);
 

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java

@@ -99,7 +99,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
     }
 
     @Override
-    public Boolean audit(Long[] ids, Long reviewStatus) {
+    public Boolean audit(Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion ) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         for (Long id:ids){
             BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id);
@@ -108,6 +108,9 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                 businessDocumentOrder.setReviewId(loginUser.getUserid());
                 businessDocumentOrder.setReview(loginUser.getUsername());
                 businessDocumentOrder.setReviewTime(new Date());
+                businessDocumentOrder.setSalesManager(SalesManager);
+                businessDocumentOrder.setReviewOpinion(reviewOpinion);
+
                 if(reviewStatus==1){
                     businessDocumentOrder.setOrderStatus(1L);
                     businessDocumentOrder.setExecuteStatus(1L);
@@ -141,6 +144,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                     
                     // 先创建执行单
                     ExecuteOrderDO executeOrderDO=new ExecuteOrderDO();
+                    BeanUtils.copyProperties(businessDocumentOrder,executeOrderDO);
                     executeOrderDO.setBusinessDocumentId(id);
                     executeOrderDO.setBusinessDocumentNumber(businessDocumentOrder.getGoodsNumber());
                     executeOrderDO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
@@ -150,10 +154,11 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                     executeOrderDO.setOrganizationId(businessDocumentOrder.getOrganizationId());
                     executeOrderDO.setOrgName(businessDocumentOrder.getOrgName());
                     executeOrderDO.setTopOrganizationId(businessDocumentOrder.getTopOrganizationId());
+                    executeOrderDO.setReservationOrderNumber(businessDocumentOrder.getReservationOrderNumber());
 
                     Long executeOrderId = executeOrderDomainService.insert(executeOrderDO);
                     
-                    // 更新业务单状态和执行单信息（只保存一次）
+                    // 更新业务单状态和执行单信息
                     businessDocumentOrder.setExecuteId(loginUser.getUserid());
                     businessDocumentOrder.setExecuteStatus(2L);
                     businessDocumentOrder.setExecuteTime(new Date());

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

@@ -742,4 +742,10 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
 
     @ApiModelProperty(value = "开户银行")
     private String accountBank;
+
+    @ApiModelProperty(value = "业务主管")
+    private String salesManager;
+
+    @ApiModelProperty(value = "审核意见")
+    private String reviewOpinion;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java

@@ -765,6 +765,12 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
     @ApiModelProperty(value = "开户银行")
     private String accountBank;
 
+    @ApiModelProperty(value = "业务主管")
+    private String salesManager;
+
+    @ApiModelProperty(value = "审核意见")
+    private String reviewOpinion;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java

@@ -168,6 +168,8 @@ public class BusinessDocumentOrderDomainService {
         tmsOrder.setRealCreateBy(String.valueOf(u.getUserid()));
         tmsOrder.setRealCreateName(u.getUsername());
         tmsOrder.setAppointShipper(userShipperPo.getShipperEnterpriseName());//20250-07-29修改：订单表委托方保存公司名字，而不是姓名
+//        tmsOrder.setSalesManager(u.getUserPo().getUserName());
+
         String salesmanCodeNc = businessDocumentOrderDO.getSalesmanId();
         if (salesmanCodeNc != null){
             String makerCodeNc = businessDocumentOrderService.selectByMakerCodeNc(salesmanCodeNc);
@@ -553,6 +555,7 @@ public class BusinessDocumentOrderDomainService {
                     tmsCargoInfo.setOrderId(String.valueOf(id));
                     tmsCargoInfo.setCargoWeight(tmsCargoInfoDTO.getWeight()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getWeight());
                     tmsCargoInfo.setCargoNum(tmsCargoInfoDTO.getCargoNum()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getCargoNum());
+                    tmsCargoInfo.setMaterialVolume(tmsCargoInfoDTO.getMaterialVolume()==null ? BigDecimal.ZERO: tmsCargoInfoDTO.getMaterialVolume());
                     businessDocumentCargoMultiMapper.insert(tmsCargoInfo);
                 }
 
@@ -654,10 +657,10 @@ public class BusinessDocumentOrderDomainService {
         return businessDocumentOrderService.getInfo(id);
     }
 
-    public Boolean audit( Long[] ids, Long reviewStatus)
+    public Boolean audit( Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion)
     {
 
-        return businessDocumentOrderService.audit(ids,reviewStatus);
+        return businessDocumentOrderService.audit(ids,reviewStatus,SalesManager,reviewOpinion);
     }
     public Boolean execute(Long[] ids) {
         return businessDocumentOrderService.execute(ids);
@@ -705,4 +708,11 @@ public class BusinessDocumentOrderDomainService {
         return serviceRequire.toString();
     }
 
+    public BusinessDocumentCargoMulti getCargoContent(Long id){
+        BusinessDocumentCargoMulti businessDocumentCargoMulti = businessDocumentCargoMultiMapper.selectOne(new LambdaQueryWrapper<BusinessDocumentCargoMulti>().eq(BusinessDocumentCargoMulti::getOrderId, id));
+        if (businessDocumentCargoMulti != null){
+            return businessDocumentCargoMulti   ;
+        }
+        return null;
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/entity/ExecuteOrder.java

@@ -68,6 +68,26 @@ public class ExecuteOrder extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     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( "下发状态 0-无状态 1-未下发 2-已下发 ")
     private Long issueStatus;
 
@@ -85,4 +105,9 @@ public class ExecuteOrder extends BaseVOEntity{
     @ApiModelProperty("业务单状态 0-未下发  1-已下发  2-已完成 3-已取消 4-已拦截")
     private Long orderStatus;
 
+    @ApiModelProperty("预约单号")
+    private String  reservationOrderNumber;
+
+    @ApiModelProperty("tms单号")
+    private String  tmsOrderNumber;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java

@@ -161,10 +161,15 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setCargoInfoList(cargoInfoList);
                     tmsOrderAddDTO.setLoadingAddressList(loadingAddressList);
                     tmsOrderAddDTO.setUnloadAddressList(unloadAddressList);
-                    tmsOrderAddDTO.setOrderShippingType(2);
+                    tmsOrderAddDTO.setOrderShippingType(businessDocumentOrder.getOrderShippingType().intValue());
                     tmsOrderAddDTO.setPayerType(0);
                     AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
                     if(ajaxResult.get("code").toString().equals("200")){
+                        String goodsNumber = (String) ajaxResult.get("data");
+                        if(ObjectUtil.isNotEmpty(goodsNumber)){
+                            executeOrder.setTmsOrderNumber(goodsNumber);
+                            executeOrderMapper.updateById(executeOrder);
+                        }
                         return true;
 
                     }else {

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.mhd.common.core.web.domain.BaseVOEntity;
 
 
@@ -85,4 +87,35 @@ public class ExecuteOrderPO extends BaseVOEntity{
 
 
 
+    @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  reservationOrderNumber;
+
+    @ApiModelProperty("tms单号")
+    private String  tmsOrderNumber;
+
+    @ApiModelProperty("业务单号")
+    private String  businessOrderNumber;
+
+
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java

@@ -92,9 +92,38 @@ public class ExecuteOrderDO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     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(name = "组织ID集合")
     private List<Long> organizationIdList;
 
     @ApiModelProperty(name = "权限菜单ID")
     private Long permissionMenuId;
+
+    @ApiModelProperty("预约单号")
+    private String  reservationOrderNumber;
+
+    @ApiModelProperty("tms单号")
+    private String  tmsOrderNumber;
+
+    @ApiModelProperty("业务单号")
+    private String  businessOrderNumber;
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java

@@ -99,4 +99,7 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{
     @ApiModelProperty("")
     private String materialCode;
 
+    @ApiModelProperty("体积")
+    private BigDecimal materialVolume;
+
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java

@@ -753,6 +753,11 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty(value = "开户银行")
     private String accountBank;
 
+    @ApiModelProperty(value = "业务主管")
+    private String salesManager;
+    @ApiModelProperty(value = "审核意见")
+    private String reviewOpinion;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java

@@ -91,6 +91,29 @@ 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;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java

@@ -89,9 +89,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 +103,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));
+    }
 
 
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java

@@ -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;
+    }
+