查询出入库单审核状态;盘点推送结果oms;

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

@@ -392,7 +392,7 @@ public class ReservationStockInOrderDomainService {
                 .set(ReservationStockInOrder::getUpdateBy, loginUser.getUserid())
                 .set(ReservationStockInOrder::getUpdateByName, userRealName)
                 .set(ReservationStockInOrder::getUpdateTime, new Date())
-                .set(ReservationStockInOrder::getAuditStatus, issueStatus)
+                .set(ReservationStockInOrder::getIssueStatus, issueStatus)
                 .in(ReservationStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds()));
     }
 
@@ -415,7 +415,7 @@ public class ReservationStockInOrderDomainService {
                 .set(ReservationStockInOrder::getIssueId, loginUser.getUserid())
                 .set(ReservationStockInOrder::getIssueName, userRealName)
                 .set(ReservationStockInOrder::getIssueTime, new Date())
-                .set(ReservationStockInOrder::getIssueStatus, 1)
+                //.set(ReservationStockInOrder::getIssueStatus, 1)
                 .set(ReservationStockInOrder::getUpdateBy, loginUser.getUserid())
                 .set(ReservationStockInOrder::getUpdateByName, userRealName)
                 .set(ReservationStockInOrder::getUpdateTime, new Date())

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

@@ -262,7 +262,7 @@ public class ReservationStockOutOrderDomainService {
                 .set(ReservationStockOutOrder::getIssueId, loginUser.getUserid())
                 .set(ReservationStockOutOrder::getIssueName, userRealName)
                 .set(ReservationStockOutOrder::getIssueTime, new Date())
-                .set(ReservationStockOutOrder::getIssueStatus, 1)
+                //.set(ReservationStockOutOrder::getIssueStatus, 1)
                 .set(ReservationStockOutOrder::getUpdateBy, loginUser.getUserid())
                 .set(ReservationStockOutOrder::getUpdateByName, userRealName)
                 .set(ReservationStockOutOrder::getUpdateTime, new Date())

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

@@ -80,6 +80,13 @@
         <result property="warehouseDate"    column="WAREHOUSE_DATE"    />
         <result property="completionTime"    column="COMPLETION_TIME"    />
         <result property="orderDate"    column="ORDER_DATE"    />
+        <result property="issueStatus"    column="issue_status"    />
+        <result property="issueTime"    column="issue_time"    />
+        <result property="issueId"    column="issue_id"    />
+        <result property="issueName"    column="issue_name"    />
+        <result property="reservationAuditId"    column="reservation_audit_id"    />
+        <result property="reservationAuditName"    column="reservation_audit_name"    />
+        <result property="reservationAuditTime"    column="reservation_audit_time"    />
     </resultMap>
 
 
@@ -113,7 +120,8 @@
         a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER,
         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.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
     </sql>
 
     <sql id="joinStockInOrderPo">

mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml

@@ -82,6 +82,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="needDeclareFlag" column="need_declare_flag"/>
         <result property="needTransportFlag" column="need_transport_flag"/>
         <result property="pictureApp" column="picture_app"/>
+        <result property="issueStatus"    column="issue_status"    />
+        <result property="issueTime"    column="issue_time"    />
+        <result property="issueId"    column="issue_id"    />
+        <result property="issueName"    column="issue_name"    />
+        <result property="reservationAuditId"    column="reservation_audit_id"    />
+        <result property="reservationAuditName"    column="reservation_audit_name"    />
+        <result property="reservationAuditTime"    column="reservation_audit_time"    />
     </resultMap>
 
 
@@ -97,7 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.CONTACT_PERSON,a.VEHICLE_MODEL_PLATE,a.ENTRUST_NO,a.TEL,a.DRIVER_SIGN,a.FAX,a.DECLARE_CUSTOMS,a.MANUFACTURER,
         a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,
         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.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
     </sql>
 
 

mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/persistence/InvestigationManageImpl.java

@@ -415,6 +415,7 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
         investigationManageUpdate.setUpdateTime(new Date());
         investigationManageUpdate.setUpdateByName(userRealName);
         investigationManageUpdate.setDifferentNumber(differentNumber);
+        pushOms(investigationManageUpdate);
         return this.updateById(investigationManageUpdate);
     }