出入库时间同步oms;
This commit is contained in:
王奎兴
+4
@@ -400,5 +400,9 @@ public class ReservationStockInOrder extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty("仓库负责人id")
|
||||
private Long directorId;
|
||||
@ApiModelProperty("入库时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date storageTime;
|
||||
|
||||
}
|
||||
+4
@@ -423,5 +423,9 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty("仓库负责人id")
|
||||
private Long directorId;
|
||||
@ApiModelProperty("入库时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date storageTime;
|
||||
|
||||
}
|
||||
+4
@@ -422,4 +422,8 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty("仓库负责人id")
|
||||
private Long directorId;
|
||||
@ApiModelProperty("入库时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date storageTime;
|
||||
}
|
||||
+4
@@ -420,4 +420,8 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
|
||||
|
||||
@ApiModelProperty("仓库负责人id")
|
||||
private Long directorId;
|
||||
@ApiModelProperty("入库时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date storageTime;
|
||||
}
|
||||
+4
@@ -439,5 +439,9 @@ public class ReservationStockOutOrder extends BaseVOEntity {
|
||||
private Long directorId;
|
||||
@ApiModelProperty("订单来源")
|
||||
private String reservationOrderSource;
|
||||
@ApiModelProperty("出库时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date outboundTime;
|
||||
|
||||
}
|
||||
+4
@@ -450,4 +450,8 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
|
||||
private Long directorId;
|
||||
@ApiModelProperty("订单来源")
|
||||
private String reservationOrderSource;
|
||||
@ApiModelProperty("出库时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date outboundTime;
|
||||
}
|
||||
+4
@@ -486,4 +486,8 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
|
||||
private Long directorId;
|
||||
@ApiModelProperty("订单来源")
|
||||
private String reservationOrderSource;
|
||||
@ApiModelProperty("出库时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date outboundTime;
|
||||
}
|
||||
+4
@@ -475,4 +475,8 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
|
||||
private Long directorId;
|
||||
@ApiModelProperty("订单来源")
|
||||
private String reservationOrderSource;
|
||||
@ApiModelProperty("出库时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date outboundTime;
|
||||
}
|
||||
+2
-1
@@ -91,6 +91,7 @@
|
||||
<result property="directorId" column="DIRECTOR_ID" />
|
||||
<result property="directorPhone" column="DIRECTOR_PHONE" />
|
||||
<result property="directorName" column="DIRECTOR_NAME" />
|
||||
<result property="storageTime" column="STORAGE_TIME" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -126,7 +127,7 @@
|
||||
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_ORDER_SOURCE,a.tms_order_number
|
||||
,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID
|
||||
,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME
|
||||
</sql>
|
||||
|
||||
<sql id="joinStockInOrderPo">
|
||||
|
||||
+2
-1
@@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="directorPhone" column="DIRECTOR_PHONE" />
|
||||
<result property="directorName" column="DIRECTOR_NAME" />
|
||||
<result property="reservationOrderSource" column="RESERVATION_ORDER_SOURCE" />
|
||||
<result property="outboundTime" column="OUTBOUND_TIME" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -110,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
|
||||
a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,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.tms_order_number,
|
||||
a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE
|
||||
a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME
|
||||
</sql>
|
||||
|
||||
|
||||
|
||||
@@ -151,6 +151,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</select>
|
||||
|
||||
<update id="updateOmsOrder">
|
||||
update "NGWL_TEST_OMS".RESERVATION_STOCK_OUT_ORDER set ISSUE_STATUS = #{status} where OUT_ORDER_NUMBER = #{orderNumber}
|
||||
update "NGWL_TEST_OMS".RESERVATION_STOCK_OUT_ORDER set ISSUE_STATUS = #{status},OUTBOUND_TIME = CURRENT_TIMESTAMP where OUT_ORDER_NUMBER = #{orderNumber}
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -126,6 +126,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</select>
|
||||
|
||||
<update id="updateOmsOrder">
|
||||
update "NGWL_TEST_OMS".RESERVATION_STOCK_IN_ORDER set ISSUE_STATUS = #{status},quantity = #{shelvesQuantity} where IN_ORDER_NUMBER = #{orderNumber}
|
||||
update "NGWL_TEST_OMS".RESERVATION_STOCK_IN_ORDER set ISSUE_STATUS = #{status},quantity = #{shelvesQuantity},STORAGE_TIME = CURRENT_TIMESTAMP where IN_ORDER_NUMBER = #{orderNumber}
|
||||
</update>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user