| src/main/java/com/zy/asrs/controller/MobileController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/OutController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/ReportToThirdService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/utils/MatUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/nc/service/impl/NccXsckmxTkWmsServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -19,9 +19,7 @@ import com.zy.common.utils.Synchro; import com.zy.common.web.BaseController; import com.zy.nc.entity.NccJcQilibcBarcodeflowWms; import com.zy.nc.entity.NccXsckmxTkWms; import com.zy.nc.service.NccJcQilibcBarcodeflowWmsService; import com.zy.nc.service.NccXsckmxTkWmsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -61,6 +59,8 @@ private ManLocDetlMapper manLocDetlMapper; @Autowired private WrkDetlLogService wrkDetlLogService; @Autowired private WrkMastLogService wrkMastLogService; @Autowired private MatService matService; @@ -74,9 +74,6 @@ @Autowired private OrderDetlPakinService orderDetlPakinService; @Autowired private NccXsckmxTkWmsService nccXsckmxTkWmsService; @RequestMapping("/pda/WarehouseOut/v1") @ManagerAuth(memo = "并板途中拣料-参考念初") @@ -289,40 +286,45 @@ @RequestMapping(value = "/mat/back") @ManagerAuth public R pdaSearchBack(@RequestParam String matnr) { EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>(); wrapper.like("VBATCHCODE", matnr); List<NccXsckmxTkWms> nccXsckmxTkWmsList = nccXsckmxTkWmsService.selectList(wrapper); if (nccXsckmxTkWmsList.isEmpty()) { return R.error("未找到此条码"); public R pdaSearchBack(@RequestParam String barcode) { WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>() .eq("barcode", barcode) .in("io_type", 101, 103, 107) .orderBy("appe_time", false) ); if(null == wrkMastLog) { return R.error("未找到此托盘码出库记录"); } List<String> orderNos = new ArrayList<>(); List<HashMap<String, Object>> list = new ArrayList<>(); for (NccXsckmxTkWms nccXsckmxTkWms : nccXsckmxTkWmsList) { if (orderNos.contains(nccXsckmxTkWms.getVsourcebillcode())) { continue; } orderNos.add(nccXsckmxTkWms.getVsourcebillcode()); HashMap<String, Object> map = new HashMap<>(); Mat mat = matService.selectByMatnr(nccXsckmxTkWms.getWlbm()); if (mat == null) { continue; } MatParam matParam = new MatParam(); Synchro.Copy(mat, matParam); matParam.setBatch(nccXsckmxTkWms.getVbatchcode()); matParam.setAnfme(0.0D); matParam.setAnfme2(0.0D); matParam.setTiaoma(matnr); map.put("orderNo", nccXsckmxTkWms.getVsourcebillcode()); map.put("khmc", nccXsckmxTkWms.getKhmc()); map.put("matData", matParam); list.add(map); List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>() .eq("wrk_no", wrkMastLog.getWrkNo()) .eq("zpallet", barcode) .orderBy("io_time", false) ); if (wrkDetlLogs.isEmpty()) { return R.error("未找到此托盘码出库记录明细"); } return R.ok().add(list); WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0); String batch = wrkDetlLog.getBatch(); HashMap<String, Object> map = new HashMap<>(); Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr()); if (mat == null) { return R.error("未找到物料明细"); } MatParam matParam = new MatParam(); Synchro.Copy(mat, matParam); matParam.setBatch(batch); matParam.setAnfme(0.0D); matParam.setAnfme2(0.0D); matParam.setTiaoma(batch); String[] split = wrkDetlLog.getOrderNo().split("-"); map.put("orderNo", split[0]); map.put("matData", matParam); return R.ok().add(map); } @RequestMapping("/comb/auth") src/main/java/com/zy/asrs/controller/OutController.java
@@ -7,6 +7,7 @@ import com.core.common.R; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; import com.zy.asrs.utils.MatUtils; import com.zy.common.model.LocDto; import com.zy.common.model.TaskDto; import com.zy.common.web.BaseController; @@ -97,7 +98,11 @@ locDto.setBoxType1(orderDetl.getBoxType1()); locDto.setBoxType2(orderDetl.getBoxType2()); locDto.setBoxType3(orderDetl.getBoxType3()); locDto.setWeight(orderDetl.getWeight()); //计算辅单位 Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme()); locDto.setWeight(weight); locDto.setUnit(orderDetl.getUnit()); locDto.setStaNos(staNos); @@ -118,7 +123,11 @@ locDto.setBoxType1(orderDetl.getBoxType1()); locDto.setBoxType2(orderDetl.getBoxType2()); locDto.setBoxType3(orderDetl.getBoxType3()); locDto.setWeight(orderDetl.getWeight()); //计算辅单位 Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme()); locDto.setWeight(weight); locDto.setUnit(orderDetl.getUnit()); locDto.setLack(Boolean.TRUE); locDtos.add(locDto); @@ -149,8 +158,12 @@ locDto.setBoxType1(orderDetl.getBoxType1()); locDto.setBoxType2(orderDetl.getBoxType2()); locDto.setBoxType3(orderDetl.getBoxType3()); locDto.setWeight(orderDetl.getWeight()); locDto.setUnit(orderDetl.getUnit()); //计算辅单位 Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme()); locDto.setWeight(weight); locDtos.add(locDto); exist.add(locDetl.getLocNo()); // 剩余待出数量递减 @@ -168,7 +181,11 @@ locDto.setBoxType1(orderDetl.getBoxType1()); locDto.setBoxType2(orderDetl.getBoxType2()); locDto.setBoxType3(orderDetl.getBoxType3()); locDto.setWeight(orderDetl.getWeight()); //计算辅单位 Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme()); locDto.setWeight(weight); locDto.setUnit(orderDetl.getUnit()); locDto.setLack(Boolean.TRUE); locDtos.add(locDto); src/main/java/com/zy/asrs/service/ReportToThirdService.java
@@ -10,6 +10,6 @@ void report(Order order, List<OrderDetl> orderDetls, DocType docType) throws Exception; boolean reportTkrk(String batch, String orderNo, Double anfme); boolean reportTkrk(String matnr, String batch, String orderNo, Double anfme); } src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -13,6 +13,7 @@ import com.zy.asrs.mapper.LocDetlMapper; import com.zy.asrs.service.LocDetlService; import com.zy.asrs.service.MatService; import com.zy.asrs.utils.MatUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -69,20 +70,8 @@ return false; } //更新辅料 Mat mat = matService.selectByMatnr(matnr); if (mat == null) { return false; } //转换关系 String origin = mat.getOrigin(); if (Cools.isEmpty(origin)) { return true; } String[] split = origin.split("/"); //辅单位 Double weight = (anfme / Double.parseDouble(split[1])) / Double.parseDouble(split[0]); //计算辅单位 Double weight = MatUtils.calcWeight(matnr, anfme); return this.baseMapper.updateWeight(weight, locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0; } } src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.DocType; import com.zy.asrs.entity.Order; @@ -19,7 +18,6 @@ import com.zy.nc.entity.*; import com.zy.nc.service.NccSaleXsfhmxWmsService; import com.zy.nc.service.NccScPcdaWmsService; import com.zy.nc.service.NccXsckmxTkWmsService; import com.zy.nc.util.NcResultMessage; import com.zy.nc.vo.*; import lombok.extern.slf4j.Slf4j; @@ -47,9 +45,6 @@ @Autowired private NccScPcdaWmsService nccScPcdaWmsService; @Autowired private NccXsckmxTkWmsService nccXsckmxTkWmsService; @Autowired private NccSaleXsfhmxWmsService nccSaleXsfhmxWmsService; @@ -210,8 +205,8 @@ } @Override public boolean reportTkrk(String batch, String orderNo, Double anfme) { Object process1 = processTKRK(batch, orderNo, anfme); public boolean reportTkrk(String matnr, String batch, String orderNo, Double anfme) { Object process1 = processTKRK(matnr, batch, orderNo, anfme); //发送请求 NcResultMessage response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1)); log.info("退库入库response:{}", response); @@ -263,17 +258,17 @@ return data; } private Object processTKRK(String batch, String orderNo, Double anfme) { EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>(); wrapper.eq("VBATCHCODE", batch).eq("VSOURCEBILLCODE", orderNo); NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper); if (null == nccXsckmxTkWms) { throw new CoolException("未找到此条码"); } private Object processTKRK(String matnr,String batch, String orderNo, Double anfme) { // EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>(); // wrapper.eq("VBATCHCODE", batch).eq("VSOURCEBILLCODE", orderNo); // NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper); // if (null == nccXsckmxTkWms) { // throw new CoolException("未找到此条码"); // } NccSaleXsfhmxWms nccSaleXsfhmxWms = nccSaleXsfhmxWmsService.selectOne(new EntityWrapper<NccSaleXsfhmxWms>() .eq("VBILLCODE", nccXsckmxTkWms.getVsourcebillcode()) .eq("WLBM", nccXsckmxTkWms.getWlbm()) .eq("VBILLCODE", orderNo) .eq("WLBM", matnr) ); if(null == nccSaleXsfhmxWms) { throw new CoolException("未找到销售单据"); @@ -288,11 +283,11 @@ saleOutBodyVO = new SaleOutBodyVO(); saleOutBodyVO.setCsourcetype("4331"); saleOutBodyVO.setCsourcebillbid(nccXsckmxTkWms.getCsourcebillbid()); saleOutBodyVO.setCsourcebillhid(nccXsckmxTkWms.getCsourcebillhid()); saleOutBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid()); saleOutBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid()); saleOutHeadVO.setCwarehouseid(nccSaleXsfhmxWms.getFhckbm()); saleOutBodyVO.setVbatchcode(nccXsckmxTkWms.getVbatchcode()); saleOutBodyVO.setVbatchcode(batch); saleOutBodyVO.setNnum(anfme * -1); saleOutBodyVOList.add(saleOutBodyVO);
@@ -8,6 +8,7 @@ import com.zy.asrs.mapper.WrkDetlMapper; import com.zy.asrs.service.MatService; import com.zy.asrs.service.WrkDetlService; import com.zy.asrs.utils.MatUtils; import com.zy.common.model.DetlDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -66,20 +67,8 @@ return false; } //更新辅料 Mat mat = matService.selectByMatnr(matnr); if (mat == null) { return false; } //转换关系 String origin = mat.getOrigin(); if (Cools.isEmpty(origin)) { return true; } String[] split = origin.split("/"); //辅单位 Double weight = (anfme / Double.parseDouble(split[1])) / Double.parseDouble(split[0]); //计算辅单位 Double weight = MatUtils.calcWeight(matnr, anfme); return baseMapper.updateWeight(weight, wrkNo, matnr, batch) > 0; } } src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -71,7 +71,7 @@ if (!Cools.isEmpty(wrkMast.getBarcode())) { WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode())); if (!Cools.isEmpty(waitPakin.getTkFlag())) { boolean result = reportToThirdService.reportTkrk(waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme()); boolean result = reportToThirdService.reportTkrk(waitPakin.getMatnr(), waitPakin.getBatch(), waitPakin.getTkFlag(), waitPakin.getAnfme()); if (!result) { exceptionHandle("退库入库上报ERP[workNo={0}]失败", wrkMast.getWrkNo()); } src/main/java/com/zy/asrs/utils/MatUtils.java
@@ -1,7 +1,10 @@ package com.zy.asrs.utils; import com.core.common.Cools; import com.core.common.SpringUtils; import com.core.exception.CoolException; import com.zy.asrs.entity.Mat; import com.zy.asrs.service.MatService; import lombok.extern.slf4j.Slf4j; /** @@ -27,4 +30,23 @@ } } public static Double calcWeight(String matnr, Double anfme) { MatService matService = SpringUtils.getBean(MatService.class); //更新辅料 Mat mat = matService.selectByMatnr(matnr); if (mat == null) { throw new CoolException("物料信息不存在"); } //转换关系 String origin = mat.getOrigin(); if (Cools.isEmpty(origin)) { throw new CoolException("主辅数量转换公式不存在"); } String[] split = origin.split("/"); //辅单位 Double weight = (anfme / Double.parseDouble(split[1])) / Double.parseDouble(split[0]); return weight; } } src/main/java/com/zy/nc/service/impl/NccXsckmxTkWmsServiceImpl.java
@@ -1,11 +1,8 @@ package com.zy.nc.service.impl; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.zy.nc.entity.NccScPcdaWms; import com.zy.nc.entity.NccXsckmxTkWms; import com.zy.nc.mapper.NccScPcdaWmsMapper; import com.zy.nc.mapper.NccXsckmxTkWmsMapper; import com.zy.nc.service.NccScPcdaWmsService; import com.zy.nc.service.NccXsckmxTkWmsService; import org.springframework.stereotype.Service;
