oms入库单订单来源；

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

@@ -389,4 +389,7 @@ public class ReservationStockInOrder extends BaseVOEntity {
     @ApiModelProperty("tms订单号")
     private String tmsOrderNumber;
 
+    @ApiModelProperty("订单来源")
+    private String reservationOrderSource;
+
 }

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

@@ -410,4 +410,7 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
     @ApiModelProperty("业务员名称")
     private String salesmanName;
 
+    @ApiModelProperty("订单来源")
+    private String reservationOrderSource;
+
 }

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

@@ -410,4 +410,6 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     private String salesmanId;
     @ApiModelProperty("业务员名称")
     private String salesmanName;
+    @ApiModelProperty("订单来源")
+    private String reservationOrderSource;
 }

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

@@ -407,4 +407,7 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
     private String salesmanId;
     @ApiModelProperty("业务员名称")
     private String salesmanName;
+
+    @ApiModelProperty("订单来源")
+    private String reservationOrderSource;
 }

mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml

@@ -87,6 +87,7 @@
         <result property="reservationAuditId"    column="reservation_audit_id"    />
         <result property="reservationAuditName"    column="reservation_audit_name"    />
         <result property="reservationAuditTime"    column="reservation_audit_time"    />
+        <result property="reservationOrderSource"    column="RESERVATION_ORDER_SOURCE"    />
     </resultMap>
 
 
@@ -121,7 +122,7 @@
         a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO,
         a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
         a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.reservation_audit_time,a.reservation_audit_name
-        ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status
+        ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE
     </sql>
 
     <sql id="joinStockInOrderPo">

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

@@ -845,6 +845,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
                 materialInventoryPO.setVolume(newVolume);
                 materialInventoryPO.setGrossWeight(newGrossWeight);
                 materialInventoryPO.setNetWeight(newNetWeight);
+                materialInventoryPO.setUpdateTime(new Date());
                 MaterialInventory materialInventory = new MaterialInventory();
                 com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
                 materialInventoryMapper.updateById(materialInventory);
@@ -895,6 +896,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventoryPO.setGrossWeight(newGrossWeight);
             materialInventoryPO.setNetWeight(newNetWeight);
             MaterialInventory materialInventory = new MaterialInventory();
+            materialInventoryPO.setUpdateTime(new Date());
             com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
             materialInventoryMapper.updateById(materialInventory);
         }
@@ -942,6 +944,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventoryPO.setVolume(newVolume);
             materialInventoryPO.setGrossWeight(newGrossWeight);
             materialInventoryPO.setNetWeight(newNetWeight);
+            materialInventoryPO.setUpdateTime(new Date());
             MaterialInventory materialInventory = new MaterialInventory();
             com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
             materialInventoryMapper.updateById(materialInventory);
@@ -990,6 +993,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventoryPO.setVolume(newVolume);
             materialInventoryPO.setGrossWeight(newGrossWeight);
             materialInventoryPO.setNetWeight(newNetWeight);
+            materialInventoryPO.setUpdateTime(new Date());
             MaterialInventory materialInventory = new MaterialInventory();
             com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
             materialInventoryMapper.updateById(materialInventory);
@@ -1038,6 +1042,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventoryPO.setVolume(newVolume);
             materialInventoryPO.setGrossWeight(newGrossWeight);
             materialInventoryPO.setNetWeight(newNetWeight);
+            materialInventoryPO.setUpdateTime(new Date());
             MaterialInventory materialInventory = new MaterialInventory();
             com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
             materialInventoryMapper.updateById(materialInventory);
@@ -1086,6 +1091,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventoryPO.setVolume(newVolume);
             materialInventoryPO.setGrossWeight(newGrossWeight);
             materialInventoryPO.setNetWeight(newNetWeight);
+            materialInventoryPO.setUpdateTime(new Date());
             MaterialInventory materialInventory = new MaterialInventory();
             com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
             materialInventoryMapper.updateById(materialInventory);
@@ -1134,6 +1140,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
             materialInventoryPO.setVolume(newVolume);
             materialInventoryPO.setGrossWeight(newGrossWeight);
             materialInventoryPO.setNetWeight(newNetWeight);
+            materialInventoryPO.setUpdateTime(new Date());
             MaterialInventory materialInventory = new MaterialInventory();
             com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
             materialInventoryMapper.updateById(materialInventory);