diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java index 3b7c186..52a2ac7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java @@ -1,5 +1,6 @@ package com.ruoyi.api.controller; +import cn.hutool.json.JSONUtil; import com.ruoyi.api.moveMsg.domain.MoveMsg; import com.ruoyi.api.service.IToErpService; import com.ruoyi.common.core.domain.AjaxResult; @@ -30,7 +31,7 @@ public class ToErpApiController { public AjaxResult receiveDeliveryNotice(@RequestBody DeliveryNoticeVo deliveryNoticeVo) { AjaxResult ajaxResult = toErpService.receiveDeliveryNotice(deliveryNoticeVo); - requestLogService.insertRequestLog(requestLogService.getRequestLog(deliveryNoticeVo.toString(), "接收入出库通知单", ajaxResult)); + requestLogService.insertRequestLog(requestLogService.getRequestLog(JSONUtil.toJsonStr(deliveryNoticeVo), "接收入出库通知单", ajaxResult)); return ajaxResult; @@ -40,7 +41,7 @@ public class ToErpApiController { /** * 回传其他入库单 */ -// @Scheduled(fixedDelay = 1500) + @Scheduled(fixedDelay = 1500) @RequestMapping("/callbackInDeliveryNotice") @ResponseBody public void callbackInDeliveryNotice() { @@ -50,7 +51,7 @@ public class ToErpApiController { /** * 回传其他出库单 */ -// @Scheduled(fixedDelay = 1500) + @Scheduled(fixedDelay = 1500) @RequestMapping("/callbackOutDeliveryNotice") @ResponseBody public void callbackDeliveryOutNotice() { @@ -59,7 +60,7 @@ public class ToErpApiController { /** * 移库回调接口 */ -// @Scheduled(fixedDelay = 1500) + @Scheduled(fixedDelay = 1500) @RequestMapping("/moveCargoSpace") @ResponseBody public void moveCargoSpace(){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 181ef74..226c64f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -309,6 +309,7 @@ public class ToErpServiceImpl implements IToErpService { d.setSpare3(item.getTopMaterial()); d.setSpare4(deliveryNoticeVo.getProjectNo()); // d.setSpare6(item.getLineNo()); + d.setSpare8(deliveryNoticeVo.getOutType()); d.setRemark(item.getRemark()); @@ -475,13 +476,14 @@ public class ToErpServiceImpl implements IToErpService { String[] splitArea = detail.getSpare9().split(","); String[] splitLocation = detail.getSpare8().split(","); String[] splitQuantity = detail.getQuantityX().split(","); + String[] lotNo = detail.getLotNo().split(","); ArrayList locationDetails = new ArrayList<>(); for(int i=0;i basStockList = entry.getValue(); DeliveryNoticeVo deliveryNoticeVo = new DeliveryNoticeVo(); deliveryNoticeVo.setBillNo(basStockList.get(0).getStockinId()); - deliveryNoticeVo.setNoteBillNo(basStockList.get(0).getStockinId()); - deliveryNoticeVo.setBillDate(basStockList.get(0).getSpare8()); + //deliveryNoticeVo.setNoteBillNo(basStockList.get(0).getStockinId()); + deliveryNoticeVo.setBillDate(DateUtil.formatDateTime(new Date())); deliveryNoticeVo.setWarehouseId(basStockList.get(0).getWarehouseId()); deliveryNoticeVo.setProjectNo(basStockList.get(0).getSpare4()); deliveryNoticeVo.setBillType("9"); @@ -559,7 +561,7 @@ public class ToErpServiceImpl implements IToErpService { for (BasStock basStock1 : basStockList) { DeliveryNoticeItemVo item = new DeliveryNoticeItemVo(); item.setLineNo(basStock1.getStockinDetailId()); - item.setNotelineNo(basStock1.getStockinDetailId()); + //item.setNotelineNo(basStock1.getStockinDetailId()); item.setInventoryCode(basStock1.getProductId()); item.setInventoryName(basStock1.getProductName()); item.setSpecModel(basStock1.getPower()); @@ -570,7 +572,7 @@ public class ToErpServiceImpl implements IToErpService { item.setTopMaterial(basStock1.getSpare3()); item.setLotNo(basStock1.getLotNo()); item.setAreaBefore(moveMsg.getOldSpace()); - item.setLocationBefore(moveMsg.getTrayCode()); + //item.setLocationBefore(moveMsg.getTrayCode()); item.setArea(moveMsg.getNewSpace()); item.setLocation(moveMsg.getTrayCode()); deliveryNoticeItemVos.add(item); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index 2fc42fa..0c5e949 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -33,7 +33,7 @@ public class ToWcsServiceImpl implements IToWcsService { @Autowired private IAgvContainerTaskService agvContainerTaskService; - public static final String PUSH_OUT_MYDO_JOB = "http://localhost:8081/wcs2Wms/api/receiveOutMydoJob"; + public static final String PUSH_OUT_MYDO_JOB = "http://192.168.188.236:8081/wcs2Wms/api/receiveOutMydoJob"; public static final String PUSH_IN_MYDO_JOB = "http://localhost:8081/wcs2Wms/api/receiveInMydoJob"; public static final String PUSH_AGV_MOVE_JOB = "http://localhost:8081/agv/api/receiveAgvMoveJob"; public static final String OUT_MYDOJOB_MS = "http://localhost:8081/wcs2Wms/api/outMydojobMakesure"; @@ -48,10 +48,6 @@ public class ToWcsServiceImpl implements IToWcsService { //查询所有未推送的料箱出库作业 MydoJob mydoJobParam = new MydoJob(); mydoJobParam.setStatus("1"); - List list = new ArrayList<>(); - list.add("21"); - list.add("26"); - mydoJobParam.setInOutIds(list); mydoJobParam.setInOut("2"); List outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); for (MydoJob outMydoJob : outMydoJobs) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index 914c79e..810deaf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -196,8 +196,14 @@ public class ToWmsServiceImpl implements IToWmsService { return AjaxResult.error("任务不存在"); } MydoJob outJob = outMydoJobs.get(0); - outJob.setExecutionPhase("2"); - mydoJobService.updateMydoJob(outJob); + if ("30".equals(outJob.getInOrOut())){ + //移库作业 + mydoJobService.ykCompleted(outJob); + }else { + //出库作业 + outJob.setExecutionPhase("2"); + mydoJobService.updateMydoJob(outJob); + } break; default: diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java index e280463..8aca668 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java @@ -229,7 +229,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService { checkStockinMapper.autoAllot(map); builder.append("行明细：" + checkStockinDetail.getStockCheckDetailId() + "，分配结果：" + map.get("v_resultmsg") + "
"); } - iToWcsService.pushOutMydoJob(); + //iToWcsService.pushOutMydoJob(); return AjaxResult.success(builder.toString()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java index d10a63f..99ef326 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/mapper/MydoJobMapper.java @@ -83,4 +83,6 @@ public interface MydoJobMapper MydoJob selectInJobByTrayCode(@Param("trayCode") String trayCode); void allotInJobSpace(HashMap map); + + void ykCompleted(HashMap map); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java index 7bc45ff..0f60062 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java @@ -109,4 +109,6 @@ public interface IMydoJobService MydoJob selectMydoJobByEntranceId(MydoJob mydoJob); List getInJobBySerial(String serial); + + void ykCompleted(MydoJob outJob); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index db0c852..f8b254b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -506,7 +506,7 @@ public class MydoJobServiceImpl implements IMydoJobService { msg = map.get("v_resultmsg").toString(); builder.append("托盘：" + basStock.getTrayCode() + "，分配结果：" + msg + "
"); } - iToWcsService.pushOutMydoJob(); + //iToWcsService.pushOutMydoJob(); if (!StrUtil.isEmpty(builder)) { return AjaxResult.warn(builder.toString()); } @@ -527,4 +527,16 @@ public class MydoJobServiceImpl implements IMydoJobService { public List getInJobBySerial(String trayCode) { return mydoJobMapper.getInJobBySerial(trayCode); } + + @Override + public void ykCompleted(MydoJob outJob) { + HashMap map = new HashMap<>(); + map.put("v_job_id", outJob.getJobId()); + mydoJobMapper.ykCompleted(map); + if (!"10".equals(map.get("v_result").toString())) { + log.error("移库任务处理异常 异常代码{}", map.get("v_result")); + }else{ + log.info("移库任务处理成功 jobId:[{}] trayCode:[{}]", outJob.getJobId(), outJob.getTrayCode()); + } + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java index f605af0..5042af9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java @@ -122,8 +122,8 @@ public class RequestLogServiceImpl implements IRequestLogService requestLog.setRequestBody(param); requestLog.setRequestUrl(url); try { - String resStr = HttpUtil.post(url, param); - + String resStr = HttpUtil.post(url, param); + requestLog.setResponseBody(resStr); // 判断resStr的状态码，如果不是200抛出异常让catch捕获 if (!JSONUtil.isJsonObj(resStr)) { throw new RuntimeException("返回结果不是有效的JSON对象"); @@ -133,7 +133,6 @@ public class RequestLogServiceImpl implements IRequestLogService if (codeObj == null || !codeObj.toString().equals("200")) { throw new RuntimeException("请求失败，状态码: " + (codeObj != null ? codeObj.toString() : "null")); } - requestLog.setResponseBody(resStr); requestLog.setResponseTime(DateUtil.formatDateTime(new Date())); requestLog.setResponseStatus("1"); requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS))); @@ -173,4 +172,9 @@ public class RequestLogServiceImpl implements IRequestLogService requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg"))); return requestLog; } + + public static void main(String[] args) { + String aa = "{\"code\":\"200,\"success\":true,\"msg\":\"请求成功\"}"; + System.out.println(JSONUtil.isJsonObj(aa)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java index 02f0c1f..8bc0e5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java @@ -180,10 +180,12 @@ public class OutStockoutServiceImpl implements IOutStockoutService for (OutStockoutDetail detail : outStockoutDetails) { if (detail.getAllotQuantity().compareTo(detail.getQuantity()) < 0){ map.put("v_stockout_detail_id", detail.getStockoutDetailId()); + map.put("v_result", null); + map.put("v_resultmsg", null); outStockoutMapper.autoAllot(map); - toWcsService.pushOutMydoJob(); + //toWcsService.pushOutMydoJob(); if (!"10".equals(map.get("v_result"))){ - stringBuilder.append(",").append(detail.getStockoutDetailId()+map.get("v_resultString")); + stringBuilder.append(",").append(detail.getStockoutDetailId()+map.get("v_resultmsg")); } }else{ stringBuilder.append(",").append(detail.getStockoutDetailId()+"单据已分配完成"); @@ -209,7 +211,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService map.put("v_stockout_detail_id", stockoutDetailId); map.put("v_stock_id", stock); outStockoutMapper.manualAllot(map); - toWcsService.pushOutMydoJob(); + //toWcsService.pushOutMydoJob(); if (!"10".equals(map.get("v_result"))){ stringBuilder.append(",").append(stockoutDetailId+map.get("v_resultString")); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java index 4027dd2..3761d77 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java @@ -48,7 +48,7 @@ public class OutStockoutDetail extends BaseEntity /** 计划数量（箱） */ @Excel(name = "计划数量", readConverterExp = "箱=") - private BigDecimal quantityX; + private String quantityX; /** 计划数量（件） */ @Excel(name = "计划数量", readConverterExp = "件=") @@ -407,12 +407,12 @@ public class OutStockoutDetail extends BaseEntity return quantity; } - public void setQuantityX(BigDecimal quantityX) + public void setQuantityX(String quantityX) { this.quantityX = quantityX; } - public BigDecimal getQuantityX() + public String getQuantityX() { return quantityX; } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index a75fd22..c7b9fab 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,14 +6,14 @@ spring: druid: # 主库数据源 master: - url: jdbc:sqlserver://172.16.4.141:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true; + url: jdbc:sqlserver://192.168.188.236:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true; username: sa password: Flrd0914. # 从库数据源 slave: # 从数据源开关/默认关闭 enabled: false - url: jdbc:mariadb://172.16.4.141:3307/mydb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mariadb://172.16.4.12:3307/mydb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: Flrd0914. # 初始连接数 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 14ccea8..97e4717 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -66,12 +66,12 @@ spring: devtools: restart: # 热部署开关 - enabled: true + enabled: false data: # redis 配置 redis: # 地址 - host: 172.16.4.141 + host: 192.168.188.236 # 端口，默认为6379 port: 6379 # 数据库索引 @@ -133,7 +133,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 720 diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index fb6af52..c703a4b 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -205,6 +205,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where job_id = #{jobId} + + {call proc_yk_complete( + #{v_job_id,jdbcType=VARCHAR,mode=IN}, + #{v_result,mode=OUT,jdbcType=INTEGER} + )} + delete from mydo_job where job_id = #{jobId} diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml index 0bf97cb..685c42c 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml @@ -253,9 +253,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x, d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j, d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid, - d.erp_stockout_id, d.unit, d.spec, d.supplier_id, d.cargo_no, d.create_time, d.print_date, - d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id, - p.product_name + d.erp_stockout_id, d.unit, d.spec, + d.product_name,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9 from out_stockout_detail_finish d left join bas_product p on d.product_id = p.product_id where stockout_guid = #{stockoutGuid} diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml index d65c78a..81c356d 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml @@ -188,10 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -202,7 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR}, #{v_stock_id,mode=IN,jdbcType=VARCHAR}, #{v_result,mode=OUT,jdbcType=VARCHAR}, - #{v_resultString,mode=OUT,jdbcType=VARCHAR} + #{v_resultmsg,mode=OUT,jdbcType=VARCHAR} ) } diff --git a/ruoyi-ui/src/views/bas/traycode/index.vue b/ruoyi-ui/src/views/bas/traycode/index.vue index b25c25b..bb89556 100644 --- a/ruoyi-ui/src/views/bas/traycode/index.vue +++ b/ruoyi-ui/src/views/bas/traycode/index.vue @@ -1,22 +1,22 @@