| 2025-12-24 | skyouc | ![]() |
| 2025-12-24 | skyouc | ![]() |
| 2025-12-24 | IZCD4L12RTSW0VZ\Administrator | ![]() |
| 2025-12-24 | IZCD4L12RTSW0VZ\Administrator | ![]() |
| 2025-12-24 | skyouc | ![]() |
| 2025-12-24 | skyouc | ![]() |
src/main/java/com/zy/api/controller/KopenApiController.java
@@ -43,13 +43,13 @@ */ @ApiOperation("上架派工单") @PostMapping("/sendInDispatch") public XSR receiveOrders(@RequestBody PubOrderParams params) { public XSR receiveOrders(@RequestBody List<PubOrderParams> params) { if (Objects.isNull(params)) { return XSR.error("参数不能为空!!"); } if (Objects.isNull(params.getType())) { return XSR.error("单据类型不能为空!"); } // if (Objects.isNull(params.getType())) { // return XSR.error("单据类型不能为空!"); // } return kopenApiService.receiveOrders(params); } @@ -79,13 +79,13 @@ */ @ApiOperation("上架派工单反馈") @PostMapping("/getInDispatchResult") public XSR getInDispatchResult(@RequestBody ReportOrderParam params) { public XSR getInDispatchResult(@RequestBody List<ReportOrderParam> params) { if (Objects.isNull(params)) { return XSR.error("参数不能为空!!"); } if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) { return XSR.error("取消条件不能为空!!"); } // if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) { // return XSR.error("取消条件不能为空!!"); // } return kopenApiService.getInDispatchResult(params); } @@ -98,13 +98,13 @@ */ @ApiOperation("备货指示派工单下发") @PostMapping("/sendOutDispatch") public XSR sendStockPrepareDispatch(@RequestBody PubOrderParams params) { public XSR sendStockPrepareDispatch(@RequestBody List<PubOrderParams> params) { if (Objects.isNull(params)) { return XSR.error("参数不能为空!!"); } if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { return XSR.error("上报订单列表不能为空!!"); } // if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { // return XSR.error("上报订单列表不能为空!!"); // } return kopenApiService.sendOutDispatch(params); } @@ -138,12 +138,9 @@ */ @ApiOperation("备货单下发") @PostMapping("/getOutDetails") public XSR getOutDetails(@RequestBody StockUpOrderParams params) { public XSR getOutDetails(@RequestBody List<StockUpOrderParams> params) { if (Objects.isNull(params)) { return XSR.error("参数不能为空!!"); } if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { return XSR.error("上报订单列表不能为空!!"); } return kopenApiService.getOutDetails(params); } @@ -172,14 +169,15 @@ */ @ApiOperation("零件损溢单下发") @PostMapping("/sendBSBYDetails") public XSR sendStockAdjust(@RequestBody StockAdjustParams params) { if (Objects.isNull(params)) { public XSR sendStockAdjust(@RequestBody List<StockAdjustParams> params) { if (Objects.isNull(params) || params.isEmpty()) { return XSR.error("参数不能为空!!"); } if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { return XSR.error("上报订单列表不能为空!!"); } return kopenApiService.sendStockAdjust(params, 1L); } } src/main/java/com/zy/api/controller/params/PageRequestParams.java
New file @@ -0,0 +1,19 @@ package com.zy.api.controller.params; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.experimental.Accessors; @Data @Accessors(chain = true) @ApiModel("分页请求参数") public class PageRequestParams { private Integer curr = 1; private Integer limit = 50; private String pro_komcode; private String pro_id; } src/main/java/com/zy/api/entity/OrderParams.java
@@ -1,7 +1,6 @@ package com.zy.api.entity; import java.io.Serializable; import java.util.List; import org.springframework.format.annotation.DateTimeFormat; src/main/java/com/zy/api/entity/StockAdjustParams.java
New file @@ -0,0 +1,27 @@ package com.zy.api.entity; import java.util.List; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @Data @Accessors(chain = true) @ApiModel(value = "StockAdjustParams", description = "零件损溢单参数") public class StockAdjustParams extends OrderParams { @ApiModelProperty("调整原因") private String resason; @ApiModelProperty("调整原因名称") private String reason_name; @ApiModelProperty("调整单编号") private String bsby_no; @ApiModelProperty("调整单明细列表") List<OrderItemsParam> details; } src/main/java/com/zy/api/service/KopenApiService.java
@@ -3,7 +3,6 @@ import java.util.List; import com.zy.api.controller.params.PageRequestParams; import com.zy.api.entity.OrderItemsParam; import com.zy.api.entity.PubOrderParams; import com.zy.api.entity.ReportOrderParam; import com.zy.api.entity.StockAdjustParams; @@ -21,7 +20,7 @@ * @param params * @return com.core.common.R */ XSR receiveOrders(PubOrderParams params); XSR receiveOrders(List<PubOrderParams> params); /** * 基础零件变更 @@ -45,14 +44,14 @@ * @param params * @return */ XSR getInDispatchResult(ReportOrderParam params); XSR getInDispatchResult(List<ReportOrderParam> params); /** * 备货指示派工单下发 * @param params * @return */ XSR sendOutDispatch(PubOrderParams params); XSR sendOutDispatch(List<PubOrderParams> params); /** * 备货单下发 @@ -61,7 +60,7 @@ * @param params * @return com.core.common.R */ XSR getOutDetails(StockUpOrderParams params); XSR getOutDetails(List<StockUpOrderParams> params); /** * 查询WMS库存信息 @@ -79,5 +78,5 @@ * @param params * @return com.core.common.R */ XSR sendStockAdjust(StockAdjustParams params, Long userId); XSR sendStockAdjust(List<StockAdjustParams> params, Long userId); } src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -69,17 +69,20 @@ /** * 接收下发订单信息 * * @param params * @param orderParams * @return com.core.common.R * @author Ryan * @date 2025/11/24 14:49 */ @Override public XSR receiveOrders(PubOrderParams params) { if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) { return XSR.error("当前类型不是上架派工单!!"); } addOrUpdateOrders(params, "add"); public XSR receiveOrders(List<PubOrderParams> orderParams) { orderParams.forEach(params -> { if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) { throw new CoolException("当前类型不是上架派工单!!"); } addOrUpdateOrders(params, "add"); }); return XSR.ok("单据下发成功!!"); } @@ -91,7 +94,7 @@ */ @Override @Transactional(rollbackFor = Exception.class) public XSR getInDispatchResult(ReportOrderParam params) { public XSR getInDispatchResult(List<ReportOrderParam> params) { if (Objects.isNull(params)) { return XSR.error("参数不能为空!!"); } @@ -124,29 +127,31 @@ /** * 备货指示派工单下发 * * @param params * @param pubOrderParams * @return com.core.common.R * @author Ryan * @date 2025/11/24 15:21 */ @Override @Transactional(rollbackFor = Exception.class) public XSR sendOutDispatch(PubOrderParams params) { if (Objects.isNull(params)) { public XSR sendOutDispatch(List<PubOrderParams> pubOrderParams) { if (Objects.isNull(pubOrderParams) || pubOrderParams.isEmpty()) { return XSR.error("参数不能为空!!"); } // 校验参数 if (Objects.isNull(params.getDispatch_no())) { return XSR.error("派工单编号不能为空!!"); } if (Objects.isNull(params.getKopen_id())) { return XSR.error("流水号不能为空!!"); } if (Objects.isNull(params.getCompany_id())) { return XSR.error("公司ID不能为空!!"); } pubOrderParams.forEach(params -> { // 校验参数 if (Objects.isNull(params.getDispatch_no())) { throw new CoolException("派工单编号不能为空!!"); } if (Objects.isNull(params.getKopen_id())) { throw new CoolException("流水号不能为空!!"); } if (Objects.isNull(params.getCompany_id())) { throw new CoolException("公司ID不能为空!!"); } addOrUpdateOrders(params, "add"); addOrUpdateOrders(params, "add"); }); return XSR.ok("备货指示派工单下发成功!!"); } @@ -415,50 +420,50 @@ /** * 备货单下发 * * @param params * @param stockUpParams * @return com.core.common.R * @author Ryan * @date 2025/11/24 15:40 */ @Override public XSR getOutDetails(StockUpOrderParams params) { if (Objects.isNull(params)) { public XSR getOutDetails(List<StockUpOrderParams> stockUpParams) { if (Objects.isNull(stockUpParams)) { return XSR.error("参数不能为空!!"); } // 校验参数 if (Objects.isNull(params.getDispatch_no())) { return XSR.error("派工单编号不能为空!!"); } if (Objects.isNull(params.getKopen_id())) { return XSR.error("流水号不能为空!!"); } if (Objects.isNull(params.getCompany_id())) { return XSR.error("公司ID不能为空!!"); } if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { return XSR.error("订单明细不能为空!!"); } List<OrderItemsParam> items = new ArrayList<>(); if (params.getDetails() != null) { for (OutOrderParams detail : params.getDetails()) { if (detail.getPartList() != null) { items.addAll(detail.getPartList()); stockUpParams.forEach(params -> { if (Objects.isNull(params.getDispatch_no())) { throw new CoolException("派工单编号不能为空!!"); } if (Objects.isNull(params.getKopen_id())) { throw new CoolException("流水号不能为空!!"); } if (Objects.isNull(params.getCompany_id())) { throw new CoolException("公司ID不能为空!!"); } if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { throw new CoolException("订单明细不能为空!!"); } List<OrderItemsParam> items = new ArrayList<>(); if (params.getDetails() != null) { for (OutOrderParams detail : params.getDetails()) { if (detail.getPartList() != null) { items.addAll(detail.getPartList()); } } } } params.getDetails().forEach(item -> { PubOrderParams pubOrderParams = new PubOrderParams(); BeanUtils.copyProperties(params, pubOrderParams); pubOrderParams.setType(item.getType()) .setPick_no(item.getPick_no()) .setCus_address(item.getCus_address()) .setOrder_no(item.getOrder_no()) .setUpdate_time(params.getUpdate_time()) .setCus_id(item.getCus_id()); pubOrderParams.setDetails(item.getPartList()); addOrUpdateOrders(pubOrderParams, "add"); params.getDetails().forEach(item -> { PubOrderParams pubOrderParams = new PubOrderParams(); BeanUtils.copyProperties(params, pubOrderParams); pubOrderParams.setType(item.getType()) .setPick_no(item.getPick_no()) .setCus_address(item.getCus_address()) .setOrder_no(item.getOrder_no()) .setUpdate_time(params.getUpdate_time()) .setCus_id(item.getCus_id()); pubOrderParams.setDetails(item.getPartList()); addOrUpdateOrders(pubOrderParams, "add"); }); }); return XSR.ok("备货单下发成功!!"); @@ -472,10 +477,15 @@ */ @Override public XSR getStockInfo(PageRequestParams params) { Page<LocDetl> locDetls = locDetlService.selectPage(new Page<>(params.getCurr(), params.getLimit()), new EntityWrapper<LocDetl>() .eq(!Objects.isNull(params.getPro_komcode()), "matnr", params.getPro_komcode()) .eq(Objects.isNull(params.getPro_id()), "supp_code", params.getPro_id())); EntityWrapper<LocDetl> wrapper = new EntityWrapper<>(); if (!Objects.isNull(params.getPro_id())) { wrapper.eq("supp_code", params.getPro_id()); } if (!Objects.isNull(params.getPro_komcode())) { wrapper.eq("matnr", params.getPro_komcode()); } Page<LocDetl> locDetls = locDetlService.selectPage(new Page<>(params.getCurr(), params.getLimit()), wrapper); return XSR.ok(locDetls.getRecords()); } @@ -490,25 +500,13 @@ */ @Override @Transactional(rollbackFor = Exception.class) public XSR sendStockAdjust(StockAdjustParams params, Long userId) { public XSR sendStockAdjust(List<StockAdjustParams> params, Long userId) { if (Objects.isNull(params)) { return XSR.error("参数不能为空!!"); } if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { return XSR.error("订单明细不能为空!!"); } // 校验参数 if (Objects.isNull(params.getBsby_no())) { return XSR.error("损溢单编号不能为空!!"); } CheckOrder checkOrder = checkOrderService .selectOne(new EntityWrapper<CheckOrder>().eq("order_no", params.getBsby_no())); if (!Objects.isNull(checkOrder)) { return XSR.error("损溢单已存在!!"); } gentCheckOrders(params, userId); params.forEach(param -> { gentCheckOrders(param, userId); }); return XSR.ok("零件损溢单下发成功!!"); } @@ -516,18 +514,32 @@ /** 生成新的零件损溢单 * @param userId */ @Transactional(rollbackFor = Exception.class) public void gentCheckOrders(StockAdjustParams checkOrder, Long userId) { public void gentCheckOrders(StockAdjustParams params, Long userId) { if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { throw new CoolException("订单明细不能为空!!"); } // 校验参数 if (Objects.isNull(params.getBsby_no())) { throw new CoolException("损溢单编号不能为空!!"); } CheckOrder checkOrder = checkOrderService .selectOne(new EntityWrapper<CheckOrder>().eq("order_no", params.getBsby_no())); if (!Objects.isNull(checkOrder)) { throw new CoolException("损溢单已存在!!"); } CheckOrder order = new CheckOrder(); order.setOrderNo(checkOrder.getBsby_no()); order.setCstmrName(checkOrder.getCompany_id()); order.setDefNumber(checkOrder.getKopen_id()); order.setOrderNo(params.getBsby_no()); order.setCstmrName(params.getCompany_id()); order.setDefNumber(params.getKopen_id()); order.setDocType(4L); order.setUuid(String.valueOf(snowflakeIdWorker.nextId())); order.setSettle(Long.valueOf(CommonEnum.COMMON_ENUM_Y.type + "")); order.setStatus(CommonEnum.COMMON_ENUM_Y.type); order.setOrderTime(checkOrder.getUpdate_time()); order.setMemo(checkOrder.getResason()); order.setShipName(checkOrder.getReason_name()); order.setOrderTime(params.getUpdate_time()); order.setMemo(params.getResason()); order.setShipName(params.getReason_name()); order.setCreateTime(new Date()); order.setUpdateTime(new Date()); @@ -535,11 +547,11 @@ throw new CoolException("损溢单新增失败!!"); } if (Objects.isNull(checkOrder.getDetails()) || checkOrder.getDetails().isEmpty()) { if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) { throw new CoolException("订单明细不能为空!!"); } checkOrder.getDetails().forEach(item -> { params.getDetails().forEach(item -> { CheckOrderDetl checkOrderDetl = new CheckOrderDetl(); //通过托盘, 物料编码, 供应商编码查询库存明细 LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>() src/main/java/com/zy/asrs/entity/CheckOrderDetl.java
@@ -5,9 +5,7 @@ import com.core.common.SpringUtils; import com.zy.asrs.enums.CheckStatusEnum; import com.zy.asrs.service.OrderService; import com.zy.asrs.entity.Order; import com.baomidou.mybatisplus.annotations.TableField; import com.core.common.SpringUtils; import com.zy.common.utils.Synchro; import com.zy.system.service.UserService; import com.zy.system.entity.User; @@ -16,15 +14,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; import com.core.common.SpringUtils; import com.zy.system.service.UserService; import com.zy.system.entity.User; import java.text.SimpleDateFormat; import java.util.Date; import java.text.SimpleDateFormat; import java.util.Date; import java.text.SimpleDateFormat; import java.util.Date; import io.swagger.annotations.ApiModelProperty; import lombok.Data; src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -1,6 +1,7 @@ package com.zy.asrs.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.CheckOrder; import com.zy.asrs.entity.Order; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,9 @@ Order selectOrderMoveStatus(); Order selectOrderMoveStatusInitial(); /** * 查询损溢单完结的订单 * @return */ List<CheckOrder> selectCompleteCheck(); } src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,10 +1,7 @@ package com.zy.asrs.service; import com.zy.asrs.entity.Order; import com.zy.asrs.entity.*; import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkMast; import java.util.List; @@ -35,5 +32,11 @@ Order selectOrderMoveStatus(); Order selectOrderMoveStatusInitial(); /** * 查询损溢单完结的订单 * @return */ List<CheckOrder> selectCompleteCheck(); } src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -209,4 +209,13 @@ return this.baseMapper.selectOrderMoveStatusInitial(); } /** * 查询损溢单完结的订单 * @return */ @Override public List<CheckOrder> selectCompleteCheck() { return this.baseMapper.selectCompleteCheck(); } } src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,6 +1,7 @@ package com.zy.asrs.task; import com.core.common.Cools; import com.zy.asrs.entity.CheckOrder; import com.zy.asrs.entity.Order; import com.zy.asrs.enums.OrderTypeEnum; import com.zy.asrs.service.ApiLogService; @@ -124,4 +125,37 @@ } } } /**损溢单完结上报 */ @Scheduled(cron = "0/30 * * * * ?") @Async("orderThreadPool") public void completeCheckOrderReport() { if (!ErpReportOld){ return; } String erpReport = Parameter.get().getErpReport(); if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { List<CheckOrder> orders = orderService.selectCompleteCheck(); for (CheckOrder order : orders) { try { ReturnT<String> result = orderSyncHandler.startCheckOrderReport(order); if (!result.isSuccess()) { log.error("单据[orderNo={}]上报erp失败", order.getOrderNo()); } } catch (Exception e) { log.error(e.getMessage()); log.error("单据[orderNo={}]上报erp失败", order.getOrderNo()); } try { Thread.sleep(300); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); } } } } } src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.exception.CoolException; @@ -10,12 +11,14 @@ import com.zy.api.entity.PubOrderParams; import com.zy.api.entity.ReportOrderParam; import com.zy.api.entity.ReportOrderParams; import com.zy.api.entity.StockAdjustParams; import com.zy.api.entity.StockUpOrderParams; import com.zy.api.entity.dto.XSR; import com.zy.api.service.KopenApiService; import com.zy.asrs.entity.*; import com.zy.asrs.enums.OrderTypeEnum; import com.zy.asrs.service.*; import com.zy.asrs.service.impl.CheckOrderDetlServiceImpl; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.utils.OrderInAndOutUtil; @@ -44,6 +47,8 @@ @Service public class OrderSyncHandler extends AbstractHandler<String> { private final CheckOrderDetlServiceImpl checkOrderDetlService; @Autowired private JdbcTemplate jdbcTemplate; @Autowired @@ -62,6 +67,10 @@ private KopenApiService kopenApiService; @Autowired private MatService matService; OrderSyncHandler(CheckOrderDetlServiceImpl checkOrderDetlService) { this.checkOrderDetlService = checkOrderDetlService; } @Transactional public ReturnT<String> startOrderIssuedOnceMore(Order order) { @@ -292,7 +301,9 @@ XSR response = null; boolean success = false; try { response = kopenApiService.getInDispatchResult(orderParam); List<ReportOrderParam> orderParams = new ArrayList<>(); orderParams.add(orderParam); response = kopenApiService.getInDispatchResult(orderParams); // if (true) { // success = true; @@ -389,7 +400,8 @@ throw new CoolException("服务器内部错误,请联系管理员"); } } else { log.error("请求接口失败!!!url:{};request:{};response:{}", MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT, log.error("请求接口失败!!!url:{};request:{};response:{}", MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT, JSON.toJSONString(orderParam), JSON.toJSONString(response)); throw new CoolException("上报KOPEN系统失败"); } @@ -424,7 +436,6 @@ .setCus_id(order.getCstmrName()) .setCus_address(order.getTel()); List<OrderItemsParam> reportOrderParams = new ArrayList<>(); orderDetls.forEach(detl -> { Mat material = matService.selectByMatnr(detl.getMatnr()); @@ -447,11 +458,10 @@ List<OutOrderParams> pubOrderParamsList = new ArrayList<>(); pubOrderParamsList.add(pubOrderParams); //设置派工单明细 // 设置派工单明细 stockUpOrderParams.setDetails(pubOrderParamsList); stockUpOrderParams.setUpdate_time(order.getUpdateBy$()); XSR response = null; boolean success = false; try { @@ -470,7 +480,8 @@ throw new CoolException("服务器内部错误,请联系管理员"); } } else { log.error("请求接口失败!!!url:{};request:{};response:{}", MesConstant.URL + MesConstant.OUT_DETAILS_RESULT, log.error("请求接口失败!!!url:{};request:{};response:{}", MesConstant.URL + MesConstant.OUT_DETAILS_RESULT, JSON.toJSONString(stockUpOrderParams), JSON.toJSONString(response)); throw new CoolException("上报KOPEN系统失败"); } @@ -497,4 +508,51 @@ return SUCCESS; } /** * 损溢单完结上报 * * @param order * @return */ @Transactional(rollbackFor = Exception.class) public ReturnT<String> startCheckOrderReport(CheckOrder order) { List<StockAdjustParams> adjustParams = new ArrayList<>(); StockAdjustParams adjustParam = new StockAdjustParams(); adjustParam.setCompany_id(order.getCstmrName()) .setWms_id(order.getId() + "") .setType(0 + "") .setCompany_id(order.getCstmrName()); adjustParam.setBsby_no(order.getNumber()) .setResason("") .setReason_name(""); List<CheckOrderDetl> detls = checkOrderDetlService .selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", order.getId())); if (Objects.isNull(detls) || detls.isEmpty()) { throw new CoolException("损溢单详情不存在"); } List<OrderItemsParam> items = new ArrayList<>(); detls.forEach(detl -> { Mat material = matService.selectByMatnr(detl.getMatnr()); if (Objects.isNull(material)) { throw new CoolException("物料不存在"); } OrderItemsParam itemParam = new OrderItemsParam(); itemParam.setLocation_no(detl.getZpallet()) .setPro_komcode(material.getMatnr()) .setPro_id(detl.getSuppCode()) .setBsby_qty(detl.getDiffQty().intValue()); items.add(itemParam); }); adjustParam.setDetails(items); adjustParams.add(adjustParam); return SUCCESS; // TODO Auto-generated method stub } } src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver username: sa password: sa@123 url: jdbc:sqlserver://192.168.4.15:1433;databasename=jsxsasrs url: jdbc:sqlserver://172.24.103.147:1433;databasename=jsxsasrs mvc: static-path-pattern: /** redis: src/main/resources/mapper/OrderMapper.xml
@@ -118,5 +118,15 @@ and move_status = 1 order by update_time </select> <select id="selectCompleteCheck" resultType="com.zy.asrs.entity.Order"> SELECT TOP 20 * FROM man_check_order WHERE settle = 4 AND status = 1 AND doc_type = 4 </select> </mapper>