| src/main/java/com/zy/asrs/controller/OutController.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/utils/MatUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/nc/service/impl/NccXsckmxTkWmsServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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/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; src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -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/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;
