仓库仓单审核接口

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/WarehouseController.java

@@ -26,7 +26,7 @@ public class WarehouseController {
     private IWarehouseService iWarehouseService;
 
     @RequestMapping(method = RequestMethod.GET, value = "/query")
-    @ApiOperation("仓储仓单管理--> 仓单注册注销查询 --> 获取列表")
+    @ApiOperation("仓储仓单管理--> 仓单注册注销，注册注销审核查询 --> 获取列表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     public PageResult<WarehouseQueryResult> query(WarehouseQueryParam param, HttpServletRequest request) {
         return iWarehouseService.query(param, request);
@@ -39,6 +39,13 @@ public class WarehouseController {
         return iWarehouseService.queryDetail(applyid, request);
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = "/queryexpress")
+    @ApiOperation("仓储仓单管理--> 仓单入库出库物流查询 --> 获取列表")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public PageResult<WarehouseExpressResult> queryexpress(WarehouseExpressParam param, HttpServletRequest request) {
+        return iWarehouseService.queryexpress(param, request);
+    }
+
     @RequestMapping(method = RequestMethod.GET, value = "/warehouseTree")
     @ApiOperation("仓储仓单管理--> 仓单注册申请、现货品种设置 --> 初始化商品信息")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
@@ -95,6 +102,13 @@ public class WarehouseController {
         return iWarehouseService.wrOutApply(param, request);
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = "/checkWROutInApply")
+    @ApiOperation("仓储仓单管理--> 仓单入库出库审核 --> 审核")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public AjaxResult checkWROutInApply(WarehouseOutInApplyParam param, HttpServletRequest request) {
+        return iWarehouseService.checkWROutInApply(param, request);
+    }
+
     @RequestMapping(method = RequestMethod.GET, value = "/receiptquery")
     @ApiOperation("仓储仓单管理--> 交收仓库管理 --> 获取列表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
@@ -104,7 +118,7 @@ public class WarehouseController {
 
     @RequestMapping(method = RequestMethod.POST, value = "/receiptadd")
     @ApiOperation("仓储仓单管理--> 交收仓库管理 --> 新增、修改")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     public AjaxResult receiptadd(@RequestBody WarehouseReceiptAddParam param, HttpServletRequest request) {
         return iWarehouseService.dealreceipt(param, request);
     }
@@ -112,8 +126,8 @@ public class WarehouseController {
     @RequestMapping(method = RequestMethod.GET, value = "/receiptDetail")
     @ApiOperation("仓储仓单管理--> 交收仓库管理 --> 详情")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    public AjaxResult<WarehouseReceiptDetailResult> receiptDetail(Long warehouseid,Integer isaudit, HttpServletRequest request) {
-        return iWarehouseService.receiptDetail(warehouseid,isaudit, request);
+    public AjaxResult<WarehouseReceiptDetailResult> receiptDetail(Long warehouseid, Integer isaudit, HttpServletRequest request) {
+        return iWarehouseService.receiptDetail(warehouseid, isaudit, request);
     }
 
     @RequestMapping(method = RequestMethod.POST, value = "/receiptaudit")
@@ -129,6 +143,7 @@ public class WarehouseController {
     public AjaxResult receiptlogff(Long autoid, HttpServletRequest request) {
         return iWarehouseService.receiptlogff(autoid, request);
     }
+
     @RequestMapping(method = RequestMethod.GET, value = "/varietquery")
     @ApiOperation("仓储仓单管理--> 现货品种设置 --> 获取列表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
@@ -138,7 +153,7 @@ public class WarehouseController {
 
     @RequestMapping(method = RequestMethod.GET, value = "/varietdetail")
     @ApiOperation("仓储仓单管理--> 现货品种设置 --> 获取列表")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     public AjaxResult<WarehouseVarietyDetailResult> varietdetail(Long wrstandardid, HttpServletRequest request) {
         return iWarehouseService.varietdetail(wrstandardid, request);
     }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IWarehouseService.java

@@ -42,4 +42,8 @@ public interface IWarehouseService {
     PageResult<WarehouseVarietyResult> varietquery(WarehouseVarietyParam param, HttpServletRequest request);
 
     AjaxResult<WarehouseVarietyDetailResult> varietdetail(Long wrstandardid, HttpServletRequest request);
+
+    PageResult<WarehouseExpressResult> queryexpress(WarehouseExpressParam param, HttpServletRequest request);
+
+    AjaxResult checkWROutInApply(WarehouseOutInApplyParam param, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/WarehouseServiceImpl.java

@@ -646,7 +646,194 @@ public class WarehouseServiceImpl implements IWarehouseService {
             result.setThjspotgoodsdeposits(thjspotgoodsdeposits);
         }
 
-        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"),result);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
+    }
+
+    @Override
+    public PageResult<WarehouseExpressResult> queryexpress(WarehouseExpressParam param, HttpServletRequest request) {
+        IPage<WarehouseExpressResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<WarehouseExpressResult> express = iWroutinapplyMapper.queryexpress(page, param);
+        PageResult<WarehouseExpressResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(express.getPages());
+        pageResult.setCurrent(express.getCurrent());
+        pageResult.setTotal(express.getTotal());
+        pageResult.setPageSize(express.getSize());
+        pageResult.setData(express.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult checkWROutInApply(WarehouseOutInApplyParam param, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+
+        Wroutinapply wrOutInApply = iWroutinapplyMapper.selectOne(new QueryWrapper<Wroutinapply>()
+                .eq("applyid", param.getApplyid()));
+        //申请类型 - 1:入库 2:出库
+        Integer applytype = wrOutInApply.getApplytype();
+        //type 1:预约初审2：预约复审3：注册初审4：注册复审
+        if (param.getType() == 1) {
+            if ((param.getApplystatus() == 2 || param.getApplystatus() == 3) && wrOutInApply.getApplystatus() == 1) {
+                wrOutInApply.setApplyid(Long.parseLong(param.getApplyid()));
+                wrOutInApply.setApplystatus(param.getApplystatus());
+                wrOutInApply.setFirstauditid(systemmanager.getAutoid());
+                wrOutInApply.setFirstaudittime(new Date());
+                wrOutInApply.setFirstremark(param.getRemark());
+            } else {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM037.getCode(), request.getHeader("Accept-Language"));
+            }
+        } else if (param.getType() == 2) {
+            if ((param.getApplystatus() == 5 || param.getApplystatus() == 6) && wrOutInApply.getApplystatus() == 2) {
+                wrOutInApply.setApplyid(Long.parseLong(param.getApplyid()));
+                wrOutInApply.setApplystatus(param.getApplystatus());
+                if (param.getApplystatus() == 5) {
+                    if (applytype == 1) {
+                        wrOutInApply.setApplytype(3);
+                    } else if (applytype == 2) {
+                        wrOutInApply.setApplytype(4);
+                    }
+
+                    wrOutInApply.setApplystatus2(0);
+                }
+                wrOutInApply.setSecondauditid(systemmanager.getAutoid());
+                wrOutInApply.setSecondaudittime(new Date());
+                wrOutInApply.setSecondremark(param.getRemark());
+            } else {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM037.getCode(), request.getHeader("Accept-Language"));
+            }
+        } else if (param.getType().equals(3)) {
+            if ((param.getApplystatus() == 2 || param.getApplystatus() == 3) && wrOutInApply.getApplystatus2() == 1) {
+                wrOutInApply.setApplyid(Long.parseLong(param.getApplyid()));
+                wrOutInApply.setApplystatus2(param.getApplystatus());
+                wrOutInApply.setFirstauditid2(systemmanager.getAutoid());
+                wrOutInApply.setFirstaudittime2(new Date());
+                wrOutInApply.setFirstremark2(param.getRemark());
+            } else {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM037.getCode(), request.getHeader("Accept-Language"));
+            }
+        } else if (param.getType().equals(4)) {
+            if ((param.getApplystatus() == 5 || param.getApplystatus() == 6) && wrOutInApply.getApplystatus2() == 2) {
+                if (applytype == 3 && param.getApplystatus() == 5) {
+                    //调用仓单入库注册复审通过
+                    wrOutInApply.setSecondauditid2(systemmanager.getAutoid());
+                    wrOutInApply.setSecondremark2(param.getRemark());
+                    wrOutInApply.setSecondaudittime2(new Date());
+                    return rkzccheck(wrOutInApply, request);
+                }
+                if (applytype == 4) {
+                    if (param.getApplystatus() == 5) {
+                        //调用仓单出库注销复审通过
+                        wrOutInApply.setSecondauditid2(systemmanager.getAutoid());
+                        wrOutInApply.setSecondremark2(param.getRemark());
+                        wrOutInApply.setSecondaudittime2(new Date());
+                        return ckzxcheck(wrOutInApply, request);
+                    }
+                }
+                wrOutInApply.setApplyid(Long.parseLong(param.getApplyid()));
+                wrOutInApply.setApplystatus2(param.getApplystatus());
+                wrOutInApply.setSecondauditid2(systemmanager.getAutoid());
+                wrOutInApply.setSecondaudittime2(new Date());
+                wrOutInApply.setSecondremark2(param.getRemark());
+            } else {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM037.getCode(), request.getHeader("Accept-Language"));
+            }
+        }
+
+        iWroutinapplyMapper.update(wrOutInApply, new QueryWrapper<Wroutinapply>().eq("applyid", param.getApplyid()));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    private AjaxResult ckzxcheck(Wroutinapply param, HttpServletRequest request) {
+        WarehouseReceiptMI1.ReceiptOutApplyLogoutReq.Builder builder = WarehouseReceiptMI1.ReceiptOutApplyLogoutReq.newBuilder();
+        WarehouseReceiptMI1.WRCommon.Builder common = WarehouseReceiptMI1.WRCommon.newBuilder();
+        Long uuid = SerialNumberUtils.getNewSerialNumber(SerialNumberUtils.prefix_warehouse);
+        common.setUserID(param.getUserid());
+        common.setAccountID(param.getAccountid());
+        common.setRelatedOrderID(uuid);
+        common.setTradeID(param.getApplyid());
+        Common.MessageHead.Builder hd = Common.MessageHead.newBuilder();
+        hd.setFunCode(FunCodeConstants.FunCode_Trade_ReceiptOutApplyLogoutReq);
+        hd.setClientTime(System.currentTimeMillis());
+        hd.setResponseTopic(SysConstants.RabbitWRRegisterRspKey);
+        hd.setMarketID(Constants.SPEICAL_MARKET_WR);
+        hd.setUUID(uuid.toString());
+        builder.setHeader(hd);
+        builder.setApplyID(param.getApplyid());
+        builder.setSecondAuditID2(param.getSecondauditid2());
+        builder.setSecondRemark2(param.getSecondremark2());
+        builder.setCommon(common);
+
+        byte[] body = ProtoHelper.getNTAS(builder.build().toByteArray(), FunCodeConstants.FunCode_Trade_ReceiptOutApplyLogoutReq);
+        Calculator ca = SerialNumberUtils.createCalculator(uuid);
+        rabbitTemplate.send(SysConstants.RabbitWRKey,new Message(body, new MessageProperties()));
+        log.debug("ReceiptOutApplyLogoutReq出库注销复审通过请求={}",builder.build());
+
+        synchronized (ca) {
+            try {
+                ca.wait(10000);
+                Object rsp_ = ca.obj;
+                if (rsp_ != null) {
+                    WarehouseReceiptMI1.ReceiptOutApplyLogoutRsp rsp = (WarehouseReceiptMI1.ReceiptOutApplyLogoutRsp) rsp_;
+                    if (rsp.getRetCode() != 0) {
+                        String errDesc = ProtoErrorCodes.resultMsg(rsp.getRetCode());
+                        log.error("出库注销复审通过失败，失败原因：" + errDesc);
+                        return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+                    }
+                }
+            } catch (InterruptedException e) {
+                log.error("消息发送失败，失败原因：" + Arrays.toString(e.getStackTrace()));
+            } finally {
+                SerialNumberUtils.lockMap.remove(uuid);
+            }
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    private AjaxResult rkzccheck(Wroutinapply param, HttpServletRequest request) {
+        WarehouseReceiptMI1.ReceiptOutApplyLogoutReq.Builder builder = WarehouseReceiptMI1.ReceiptOutApplyLogoutReq.newBuilder();
+        WarehouseReceiptMI1.WRCommon.Builder common = WarehouseReceiptMI1.WRCommon.newBuilder();
+        Long uuid = SerialNumberUtils.getNewSerialNumber(SerialNumberUtils.prefix_warehouse);
+        common.setUserID(param.getUserid());
+        common.setAccountID(param.getAccountid());
+        common.setRelatedOrderID(uuid);
+        common.setTradeID(param.getApplyid());
+        Common.MessageHead.Builder hd = Common.MessageHead.newBuilder();
+        hd.setFunCode(FunCodeConstants.FunCode_Trade_ReceiptInApplyRegisterReq);
+        hd.setClientTime(System.currentTimeMillis());
+        hd.setResponseTopic(SysConstants.RabbitWRRegisterRspKey);
+        hd.setMarketID(Constants.SPEICAL_MARKET_WR);
+        hd.setUUID(uuid.toString());
+        builder.setHeader(hd);
+        builder.setApplyID(param.getApplyid());
+        builder.setSecondAuditID2(param.getSecondauditid2());
+        builder.setSecondRemark2(param.getSecondremark2());
+        builder.setCommon(common);
+
+        byte[] body = ProtoHelper.getNTAS(builder.build().toByteArray(), FunCodeConstants.FunCode_Trade_ReceiptInApplyRegisterReq);
+        Calculator ca = SerialNumberUtils.createCalculator(uuid);
+        rabbitTemplate.send(SysConstants.RabbitWRKey, new Message(body, new MessageProperties()));
+        log.debug("ReceiptOutApplyLogoutReq仓单入库注册复审通过请求={}", builder.build());
+
+        synchronized (ca) {
+            try {
+                ca.wait(10000);
+                Object rsp_ = ca.obj;
+                if (rsp_ != null) {
+                    WarehouseReceiptMI1.ReceiptInApplyRegisterRsp rsp = (WarehouseReceiptMI1.ReceiptInApplyRegisterRsp) rsp_;
+                    if (rsp.getRetCode() != 0) {
+                        String errDesc = ProtoErrorCodes.resultMsg(rsp.getRetCode());
+                        log.error("仓单入库注册复审通过失败，失败原因：" + errDesc);
+                        return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+                    }
+                }
+            } catch (InterruptedException e) {
+                log.error("消息发送失败，失败原因：" + Arrays.toString(e.getStackTrace()));
+            } finally {
+                SerialNumberUtils.lockMap.remove(uuid);
+            }
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
     private void sendWRFactorTypeNameUpdateReqMsg(Warehouseinfo wh, Systemmanager systemmanager) {

mtp3-century/src/main/resources/mapper/WroutinapplyMapper.xml

@@ -276,4 +276,56 @@
         and t.deliverygoodsid=0
         and t.isvalid = 1 order by t.orderindex
     </select>
+    <select id="queryexpress" resultType="com.muchinfo.mtp3pojos.vo.warehouse.WarehouseExpressResult">
+        select w.ordertype,w.outinmodel,w.shippingmodel,w.expressnum,w.expresscompany,w.vehiclenum,
+        w.contactname,w.contactnum,w.outindate,w.createtime,w.updatetime,w.remark,
+        u.customername username,
+        s.wrstandardcode wrstandardcode,
+        s.wrstandardname wrstandardname,
+        a.applytime applytime,
+        a.applyid applyid
+        from wroutinapply a
+        left join wroutinexpress w on w.applyid = a.applyid
+        left join wrstandard s on a.wrstandardid = s.wrstandardid
+        left join userinfo u on a.userid = u.userid
+        <where>
+            <if test="vo.expressnum != null and vo.expressnum != ''">
+                and (w.expressnum like '%'||#{vo.expressnum,jdbcType=VARCHAR}||'%')
+            </if>
+            <if test="vo.shippingmodel != null">
+                and w.shippingmodel = #{vo.shippingmodel}
+            </if>
+            <if test="vo.contactname != null and vo.contactname != ''">
+                and (w.contactname like '%'||#{vo.contactname,jdbcType=VARCHAR}||'%')
+            </if>
+            <if test="vo.contactnum != null and vo.contactnum != ''">
+                and (w.contactnum like '%'||#{vo.contactnum,jdbcType=VARCHAR}||'%')
+            </if>
+            <if test="vo.applyid != null and vo.applyid != ''">
+                and (w.applyid like '%'||#{vo.applyid,jdbcType=VARCHAR}||'%')
+            </if>
+            <if test="vo.applytimestr != null and vo.applytimestr != ''">
+                and a.applytime &gt;= to_date(#{vo.applytimestr}||',00:00:00','yyyyMMdd,hh24:mi:ss')
+                and a.applytime &lt;= to_date(#{vo.applytimestr}||',23:59:59','yyyyMMdd,hh24:mi:ss')
+            </if>
+            <if test="vo.expresscompany != null and vo.expresscompany != ''">
+                and (w.expresscompany like '%'||#{vo.expresscompany,jdbcType=VARCHAR}||'%')
+            </if>
+            <if test="vo.username != null and vo.username != ''">
+                and ((a.userid like '%'||#{vo.username,jdbcType=VARCHAR}||'%')
+                or(u.customername like '%'||#{vo.username,jdbcType=VARCHAR}||'%'))
+            </if>
+            <if test="vo.outinmodel != null">
+                and w.outinmodel = #{vo.outinmodel}
+            </if>
+            <if test="ordertype == 1">
+                and a.applytype in (1,3)
+            </if>
+            <if test="ordertype == 2">
+                and a.applytype in (2,4)
+            </if>
+            and a.ApplyStatus != 8 and a.ApplyStatus2 != 8
+        </where>
+        order by a.applytime desc
+    </select>
 </mapper>

mtp3-century/src/main/resources/message_en.properties

@@ -65,6 +65,7 @@ message_error_code_system033=The cash withdrawal amount must be greater than 0!
 message_error_code_system034=The bank is not in a successful check-in status and does not support withdrawal of transaction fees!
 message_error_code_system035=Non preliminary review status cannot be revoked, please refresh the page
 message_error_code_system036=The decimal place of the price is% s. Please enter a multiple of% s
+message_error_code_system037=Audit failed, parameter error
 login_error_code_001=Account or password error
 login_error_code_002=Unauthorized access is not allowed! Please contact the administrator to handle it!
 login_error_code_003=Login locked!

mtp3-century/src/main/resources/message_th.properties

@@ -65,6 +65,7 @@ message_error_code_system033=\u0E16\u0E2D\u0E19\u0E40\u0E07\u0E34\u0E19\u0E2A\u0
 message_error_code_system034=\u0E18\u0E19\u0E32\u0E04\u0E32\u0E23\u0E44\u0E21\u0E48\u0E44\u0E14\u0E49\u0E40\u0E02\u0E49\u0E32\u0E2A\u0E39\u0E48\u0E23\u0E30\u0E1A\u0E1A\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08\u0E04\u0E48\u0E32\u0E18\u0E23\u0E23\u0E21\u0E40\u0E19\u0E35\u0E22\u0E21\u0E01\u0E32\u0E23\u0E16\u0E2D\u0E19\u0E40\u0E07\u0E34\u0E19\u0E44\u0E21\u0E48\u0E23\u0E2D\u0E07\u0E23\u0E31\u0E1A!
 message_error_code_system035=\u0E2A\u0E16\u0E32\u0E19\u0E30\u0E17\u0E35\u0E48\u0E44\u0E21\u0E48\u0E23\u0E2D\u0E01\u0E32\u0E23\u0E1E\u0E34\u0E08\u0E32\u0E23\u0E13\u0E32\u0E04\u0E14\u0E35\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E40\u0E1E\u0E34\u0E01\u0E16\u0E2D\u0E19\u0E44\u0E14\u0E49\u0E42\u0E1B\u0E23\u0E14\u0E23\u0E35\u0E40\u0E1F\u0E23\u0E0A\u0E2B\u0E19\u0E49\u0E32
 message_error_code_system036=\u0E23\u0E32\u0E04\u0E32\u0E17\u0E28\u0E19\u0E34\u0E22\u0E21\u0E04\u0E37\u0E2D%s \u0E42\u0E1B\u0E23\u0E14\u0E1B\u0E49\u0E2D\u0E19\u0E08\u0E33\u0E19\u0E27\u0E19\u0E40\u0E17\u0E48\u0E32\u0E02\u0E2D\u0E07%s
+message_error_code_system037=\u0E01\u0E32\u0E23\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E25\u0E49\u0E21\u0E40\u0E2B\u0E25\u0E27\u0E1E\u0E32\u0E23\u0E32\u0E21\u0E34\u0E40\u0E15\u0E2D\u0E23\u0E4C\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14
 login_error_code_001=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E2B\u0E23\u0E37\u0E2D\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E44\u0E21\u0E48\u0E16\u0E39\u0E01\u0E15\u0E49\u0E2D\u0E07
 login_error_code_002=\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E40\u0E02\u0E49\u0E32\u0E16\u0E36\u0E07\u0E44\u0E14\u0E49\u0E42\u0E14\u0E22\u0E44\u0E21\u0E48\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E2D\u0E19\u0E38\u0E0D\u0E32\u0E15! \u0E01\u0E23\u0E38\u0E13\u0E32\u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A\u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E08\u0E31\u0E14\u0E01\u0E32\u0E23!
 login_error_code_003=\u0E25\u0E47\u0E2D\u0E01\u0E2D\u0E34\u0E19!

mtp3-century/src/main/resources/message_vi.properties

@@ -65,6 +65,7 @@ message_error_code_system033=S\u1ED1 ti\u1EC1n m\u1EB7t ph\u1EA3i l\u1EDBn h\u01
 message_error_code_system034=Ng\u00E2n h\u00E0ng kh\u00F4ng ph\u1EA3i k\u00FD \u0111\u1EBFn tr\u1EA1ng th\u00E1i th\u00E0nh c\u00F4ng, kh\u00F4ng h\u1ED7 tr\u1EE3 r\u00FAt ti\u1EC1n th\u1EE7 t\u1EE5c!
 message_error_code_system035=Kh\u00F4ng th\u1EC3 h\u1EE7y b\u1ECF tr\u1EA1ng th\u00E1i kh\u00F4ng ch\u1EDD x\u00E9t x\u1EED, vui l\u00F2ng l\u00E0m m\u1EDBi l\u1EA1i trang
 message_error_code_system036=Gi\u00E1 th\u1EADp ph\u00E2n%s, h\u00E3y nh\u1EADp b\u1ED9i s\u1ED1 c\u1EE7a%s
+message_error_code_system037=Ki\u1EC3m to\u00E1n th\u1EA5t b\u1EA1i, th\u00F4ng s\u1ED1 sai
 login_error_code_001=L\u1ED7i t\u00E0i kho\u1EA3n ho\u1EB7c m\u1EADt kh\u1EA9u
 login_error_code_002=Kh\u00F4ng \u0111\u01B0\u1EE3c ph\u00E9p, kh\u00F4ng th\u1EC3 truy c\u1EADp! Vui l\u00F2ng li\u00EAn h\u1EC7 v\u1EDBi qu\u1EA3n tr\u1ECB vi\u00EAn \u0111\u1EC3 x\u1EED l\u00FD!
 login_error_code_003=Kh\u00F3a \u0111\u0103ng nh\u1EADp!

mtp3-century/src/main/resources/message_zh-cn.properties

@@ -65,6 +65,7 @@ message_error_code_system033=\u63D0\u73B0\u91D1\u989D\u987B\u5927\u4E8E0\uFF01
 message_error_code_system034=\u94F6\u884C\u4E0D\u662F\u7B7E\u5230\u6210\u529F\u72B6\u6001\uFF0C\u4E0D\u652F\u6301\u624B\u7EED\u8D39\u63D0\u73B0\uFF01
 message_error_code_system035=\u975E\u5F85\u521D\u5BA1\u72B6\u6001\u65E0\u6CD5\u64A4\u9500,\u8BF7\u5237\u65B0\u9875\u9762
 message_error_code_system036=\u4EF7\u683C\u5C0F\u6570\u4F4D\u4E3A%s, \u8BF7\u8F93\u5165%s\u7684\u500D\u6570
+message_error_code_system037=\u5BA1\u6838\u5931\u8D25\uFF0C\u53C2\u6570\u9519\u8BEF
 login_error_code_001=\u8D26\u6237\u6216\u5BC6\u7801\u9519\u8BEF
 login_error_code_002=\u672A\u7ECF\u5141\u8BB8\uFF0C\u4E0D\u53EF\u8BBF\u95EE\uFF01\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u5904\u7406\uFF01
 login_error_code_003=\u767B\u5F55\u9501\u5B9A\uFF01

mtp3-century/src/main/resources/message_zh-hk.properties

@@ -65,6 +65,7 @@ message_error_code_system033=\u63D0\u73FE\u91D1\u984D\u9808\u5927\u65BC0\uFF01
 message_error_code_system034=\u9280\u884C\u4E0D\u662F\u7C3D\u5230\u6210\u529F\u72C0\u614B\uFF0C\u4E0D\u652F\u6301\u624B\u7E8C\u8CBB\u63D0\u73FE\uFF01
 message_error_code_system035=\u975E\u5F85\u521D\u5BE9\u72C0\u614B\u7121\u6CD5\u64A4\u92B7\uFF0C\u8ACB\u5237\u65B0\u9801\u9762
 message_error_code_system036=\u50F9\u683C\u5C0F\u6578\u4F4D\u70BA%s\uFF0C\u8ACB\u8F38\u5165%s\u7684\u500D\u6578
+message_error_code_system037=\u7A3D\u6838\u5931\u6557\uFF0C\u53C3\u6578\u932F\u8AA4
 login_error_code_001=\u5E33\u6236\u6216\u5BC6\u78BC\u932F\u8AA4
 login_error_code_002=\u672A\u7D93\u5141\u8A31\uFF0C\u4E0D\u53EF\u8A2A\u554F\uFF01 \u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\u8655\u7406\uFF01
 login_error_code_003=\u767B\u5165\u9396\u5B9A\uFF01

mtp3-century/src/main/resources/message_zh-tw.properties

@@ -65,6 +65,7 @@ message_error_code_system033=\u63D0\u73FE\u91D1\u984D\u9808\u5927\u65BC0\uFF01
 message_error_code_system034=\u9280\u884C\u4E0D\u662F\u7C3D\u5230\u6210\u529F\u72C0\u614B\uFF0C\u4E0D\u652F\u6301\u624B\u7E8C\u8CBB\u63D0\u73FE\uFF01
 message_error_code_system035=\u975E\u5F85\u521D\u5BE9\u72C0\u614B\u7121\u6CD5\u64A4\u92B7\uFF0C\u8ACB\u5237\u65B0\u9801\u9762
 message_error_code_system036=\u50F9\u683C\u5C0F\u6578\u4F4D\u70BA%s\uFF0C\u8ACB\u8F38\u5165%s\u7684\u500D\u6578
+message_error_code_system037=\u7A3D\u6838\u5931\u6557\uFF0C\u53C3\u6578\u932F\u8AA4
 login_error_code_001=\u5E33\u6236\u6216\u5BC6\u78BC\u932F\u8AA4
 login_error_code_002=\u672A\u7D93\u5141\u8A31\uFF0C\u4E0D\u53EF\u8A2A\u554F\uFF01 \u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\u8655\u7406\uFF01
 login_error_code_003=\u767B\u5165\u9396\u5B9A\uFF01

mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/MessageType.java

@@ -73,6 +73,7 @@ public enum MessageType {
     MESSAGE_ERROR_CODE_SYSTEM034("message_error_code_system034", "银行不是签到成功状态，不支持手续费提现！"),
     MESSAGE_ERROR_CODE_SYSTEM035("message_error_code_system035", "非待初审状态无法撤销,请刷新页面"),
     MESSAGE_ERROR_CODE_SYSTEM036("message_error_code_system036", "价格小数位为%s, 请输入%s的倍数"),
+    MESSAGE_ERROR_CODE_SYSTEM037("message_error_code_system037", "审核失败，参数错误"),
 
     LOGIN_ERROR_CODE_001("login_error_code_001", "账户或密码错误"),
     LOGIN_ERROR_CODE_002("login_error_code_002", "未经允许，不可访问！请联系管理员处理"),

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IWroutinapplyMapper.java

@@ -44,4 +44,6 @@ public interface IWroutinapplyMapper extends BaseMapper<Wroutinapply> {
     List<WarehouseVarietyResult> queryWRStandardSet(@Param("vo") WarehouseVarietyParam param);
 
     List<Dgfactoryitem> queryDGFactoryItemList(@Param("wrstandardid")Long wrstandardid, @Param("deliverygoodsid")Long deliverygoodsid);
+
+    IPage<WarehouseExpressResult> queryexpress(IPage<WarehouseExpressResult> page, @Param("vo") WarehouseExpressParam param);
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/warehouse/WarehouseExpressParam.java

@@ -0,0 +1,47 @@
+package com.muchinfo.mtp3pojos.vo.warehouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value="WarehouseExpressParam对象", description="入库出库物流")
+public class WarehouseExpressParam {
+
+    @ApiModelProperty(value = "货运单号")
+    private String expressnum;
+
+    @ApiModelProperty(value = "送货方式")
+    private Integer outinmodel;
+
+    @ApiModelProperty(value = "预约单号")
+    private String applyid;
+
+    @ApiModelProperty(value = "物流联系人")
+    private String contactname;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactnum;
+
+    @ApiModelProperty(value = "申请日期")
+    private String applytimestr;
+
+    @ApiModelProperty(value = "物流公司")
+    private String expresscompany;
+
+    @ApiModelProperty(value = "申请人")
+    private String username;
+
+    @ApiModelProperty(value = "入库1 出库2")
+    private Integer ordertype;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/warehouse/WarehouseExpressResult.java

@@ -0,0 +1,54 @@
+package com.muchinfo.mtp3pojos.vo.warehouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value="WarehouseExpressResult对象", description="入库出库物流响应")
+public class WarehouseExpressResult {
+
+    @ApiModelProperty(value = "预约单号")
+    private String applyid;
+
+    @ApiModelProperty(value = "代码/名称")
+    private String wrstandardname;
+
+    @ApiModelProperty(value = "代码/名称")
+    private String wrstandardcode;
+
+    @ApiModelProperty(value = "送货方式")
+    private Integer outinmodel;
+
+    @ApiModelProperty(value = "联系人")
+    private String contactname;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactnum;
+
+    @ApiModelProperty(value = "货运单号")
+    private String expressnum;
+
+    @ApiModelProperty(value = "货运方式")
+    private Integer shippingmodel;
+
+    @ApiModelProperty(value = "物流公司")
+    private String expresscompany;
+
+    @ApiModelProperty(value = "申请人")
+    private String username;
+
+    @ApiModelProperty(value = "申请时间")
+    private Date applytime;
+
+    @ApiModelProperty(value = "出库日期")
+    private String outindate;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/warehouse/WarehouseOutInApplyParam.java

@@ -0,0 +1,26 @@
+package com.muchinfo.mtp3pojos.vo.warehouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value="WarehouseOutInApplyParam对象", description="审核")
+public class WarehouseOutInApplyParam {
+
+    private String applyid;
+
+    private String remark;
+
+    @ApiModelProperty(value = "审核状态")
+    private Integer applystatus;
+
+    @ApiModelProperty(value = "1:预约初审2：预约复审3：注册注销初审4：注册注销复审 5:初审撤回")
+    private Integer type;
+}