wms费用科目修改;

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java

@@ -172,4 +172,6 @@ public class HandoverTaskOrderDTO extends BaseVOEntity {
 
     @ApiModelProperty("app上传的图片")
     private String pictureApp;
-}
+
+    private String billingJson;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java

@@ -2,6 +2,7 @@ package com.mhd.wms.interfaces.dto.stockInOrder;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mhd.common.core.annotation.Excel;
+import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
 import com.mhd.wms.interfaces.dto.inMaterialDetail.InMaterialDetailDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -376,4 +377,15 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty("入库明细-物料编码，模糊匹配，与前端参数 materialCode 一致")
     private String materialCode;
+
+    @ApiModelProperty(name = "费用参数json")
+    private String billingJson;
+    @ApiModelProperty("费用")
+    List<ReceiptOrderAccount> receiptOrderAccountList;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -3,6 +3,7 @@ package com.mhd.wms.interfaces.dto.stockOutOrder;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mhd.common.core.annotation.Excel;
+import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
 import com.mhd.wms.interfaces.dto.outMaterialDetail.OutMaterialDetailDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -405,4 +406,14 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
 
     @ApiModelProperty("出库交接图片，PDA出库交接时上传的照片，多张图片以逗号隔开")
     private String pictureApp;
+    @ApiModelProperty("计费信息")
+    private String billingJson;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
+    @ApiModelProperty("费用")
+    List<ReceiptOrderAccount> receiptOrderAccountList;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java

@@ -156,4 +156,7 @@ public class StockReceiptOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty("费用")
     List<ReceiptOrderAccount> receiptOrderAccountList;
+
+    @ApiModelProperty(name = "费用参数json")
+    private String billingJson;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java

@@ -8,8 +8,11 @@ import com.mhd.common.core.utils.StringUtils;
 import com.mhd.wms.application.service.stockInOrder.StockInOrderApplicationService;
 import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
+import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO;
 import com.mhd.wms.interfaces.assember.stockInOrder.StockInOrderAssembler;
+import com.mhd.wms.interfaces.assember.stockOutOrder.StockOutOrderAssembler;
 import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
+import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +35,8 @@ public class StockInOrderApi extends BaseController {
 
     @Resource
     private StockInOrderAssembler stockInOrderAssembler;
+    @Resource
+    private StockOutOrderAssembler stockOutOrderAssembler;
 
     /**
      * 分页查询入库单列表
@@ -63,6 +68,28 @@ public class StockInOrderApi extends BaseController {
         }
     }
 
+    /**
+     * 编辑入库单
+     */
+    @ApiOperation("编辑入库单")
+    @PostMapping("/saveAmount")
+    public AjaxResult saveAmount(@RequestBody StockInOrderDTO stockInOrderDTO)
+    {
+        StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
+        return toAjax(stockInOrderApplicationService.saveAmount(stockInOrderDO));
+    }
+
+    /**
+     * 编辑入库单
+     */
+    @ApiOperation("编辑入库单")
+    @PostMapping("/saveOutAmount")
+    public AjaxResult saveOutAmount(@RequestBody StockOutOrderDTO stockOutOrderDTO)
+    {
+        StockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO);
+        return toAjax(stockInOrderApplicationService.saveOutAmount(stockOutOrderDO));
+    }
+
     /**
      * 批量删除入库单
      */
@@ -129,4 +156,4 @@ public class StockInOrderApi extends BaseController {
         return AjaxResult.success(stockInOrderApplicationService.closeOrder(stockInOrderDO));
     }
 
-}
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApp/stockReceiptOrder/StockReceiptOrderAppApi.java

@@ -79,6 +79,7 @@ public class StockReceiptOrderAppApi extends BaseController {
     @ApiOperation("完成收货")
     @PostMapping("/completeReceipt")
     public AjaxResult completeReceipt(@RequestBody StockReceiptOrderDTO stockReceiptOrderDTO) {
+        stockReceiptOrderApplicationService.updateInOrder(stockReceiptOrderDTO);
         return toAjax(stockReceiptOrderApplicationService.completeReceiptByApp(stockReceiptOrderDTO.getReceiptOrderId()));
     }
 
@@ -98,4 +99,4 @@ public class StockReceiptOrderAppApi extends BaseController {
         return toAjax(stockReceiptOrderApplicationService.noOrderReceipt(stockReceiptOrderDO));
     }
 
-}
+}