oms出入库;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java

@@ -355,7 +355,7 @@ public class ReservationStockInOrder extends BaseVOEntity {
 
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
-    private Long issueStatus;
+    private Integer issueStatus;
 
     @ApiModelProperty("下发时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -379,4 +379,11 @@ public class ReservationStockInOrder extends BaseVOEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date reservationAuditTime;
 
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java

@@ -375,7 +375,7 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
     private String orderStatus;
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
-    private Long issueStatus;
+    private Integer issueStatus;
 
     @ApiModelProperty("下发时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -398,4 +398,11 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date reservationAuditTime;
+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java

@@ -381,7 +381,7 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     private String materialCode;
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
-    private Long issueStatus;
+    private Integer issueStatus;
 
     @ApiModelProperty("下发时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -404,4 +404,10 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date reservationAuditTime;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java

@@ -378,7 +378,7 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
     private String materialCode;
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
-    private Long issueStatus;
+    private Integer issueStatus;
 
     @ApiModelProperty("下发时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -401,4 +401,10 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date reservationAuditTime;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java

@@ -376,7 +376,7 @@ public class ReservationStockInOrderDomainService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean auditState(ReservationStockInOrderDO stockInOrderDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Integer auditStatus = stockInOrderDO.getAuditStatus();
+        Integer auditStatus = stockInOrderDO.getIssueStatus();
         Integer issueStatus = 0;
         issueStatus = auditStatus == 2 ? 2 : 3;
         // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java

@@ -396,7 +396,7 @@ public class ReservationStockOutOrder extends BaseVOEntity {
     private Date documentDate;
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
-    private Long issueStatus;
+    private Integer issueStatus;
 
     @ApiModelProperty("下发时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -420,4 +420,11 @@ public class ReservationStockOutOrder extends BaseVOEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date reservationAuditTime;
 
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java

@@ -408,7 +408,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     private String carrierName;
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
-    private Long issueStatus;
+    private Integer issueStatus;
 
     @ApiModelProperty("下发时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -431,4 +431,10 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date reservationAuditTime;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java

@@ -444,7 +444,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     private String carrierName;
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
-    private Long issueStatus;
+    private Integer issueStatus;
 
     @ApiModelProperty("下发时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -467,4 +467,10 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date reservationAuditTime;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java

@@ -433,7 +433,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     private String carrierName;
 
     @ApiModelProperty( "下发状态 0-无状态 1-未下发 2-已下发 ")
-    private Long issueStatus;
+    private Integer issueStatus;
 
     @ApiModelProperty("下发时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -456,4 +456,10 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date reservationAuditTime;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -224,7 +224,7 @@ public class ReservationStockOutOrderDomainService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean auditState(ReservationStockOutOrderDO stockOutOrderDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Integer auditStatus = stockOutOrderDO.getAuditStatus();
+        Integer auditStatus = stockOutOrderDO.getIssueStatus();
         Integer issueStatus = 0;
         issueStatus = auditStatus == 2 ? 2 : 3;
         // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java

@@ -680,7 +680,12 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             //inventoryAdjustmentRecord.setInventoryBeforeQuantity(oldInventoryQuantity);
             inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
         } else if ("库存冻结".equals(adjustAction)) {
-
+            inventoryAdjustmentRecord.setAllocationBeforeQuantity(materialInventory.getAllocationQuantity());
+            inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity().subtract(materialInventoryParamDO.getQuantity()));
+            inventoryAdjustmentRecord.setFreezeBeforeQuantity(materialInventory.getFreezeQuantity());
+            inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory.getFreezeQuantity().add(materialInventoryParamDO.getQuantity()));//调整后 冻结-出库
+            inventoryAdjustmentRecord.setInventoryBeforeQuantity(materialInventory.getInventoryQuantity());
+            inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
         }