package com.zy.asrs.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.R; import com.core.common.SnowflakeIdWorker; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.*; import com.zy.asrs.mapper.ManLocDetlMapper; import com.zy.asrs.service.*; import com.zy.common.model.DetlDto; import com.zy.common.model.LocDetlDto; import com.zy.common.model.enums.IoWorkType; import com.zy.common.service.CommonService; import com.zy.common.utils.Synchro; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; /** * 移动端服务核心类 * Created by vincent on 2020/6/28 */ @Slf4j @Service public class MobileServiceImpl implements MobileService { @Autowired private MatService matService; @Autowired private WaitPakinService waitPakinService; @Autowired private OrderService orderService; @Autowired private OrderDetlService orderDetlService; @Autowired private BasDevpService basDevpService; @Autowired private WrkMastService wrkMastService; @Autowired private WrkDetlService wrkDetlService; @Autowired private PackService packService; @Autowired private OpenService openService; @Autowired private SnowflakeIdWorker snowflakeIdWorker; @Autowired private ApiLogService apiLogService; @Autowired private BasCrnpService basCrnpService; @Autowired private LocMastService locMastService; @Autowired private LocDetlService locDetlService; @Autowired private StaDescService staDescService; @Autowired private CommonService commonService; @Autowired private NodeService nodeService; @Autowired private ManLocDetlService manLocDetlService; @Autowired private ManLocDetlMapper manLocDetlMapper; @Autowired private DocTypeService docTypeService; @Autowired private MatV2Service matV2Service; @Autowired private BomMatService bomMatService; @Autowired private WorkService workService; @Override @Transactional public void comb(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); } if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){ throw new CoolException("入库物料数量不能为空"); } // 判断是否有相同条码的数据 if (waitPakinService.selectCount(new EntityWrapper(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { throw new CoolException(param.getBarcode() + "数据正在进行入库"); } int countLoc = locDetlService.selectCount(new EntityWrapper().eq("zpallet",param.getBarcode())); WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode()); if (wrkMast != null && wrkMast.getIoType() < 100){ throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode()); } if (countLoc > 0 ) { throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode()); } //设置非null批号, for (CombParam.CombMat combMat : param.getCombMats()) { if (combMat.getBatch() == null){ combMat.setBatch(""); } } Date now = new Date(); // 无单组托 if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) { // 生成入库通知档 List detlDtos = new ArrayList<>(); param.getCombMats().forEach(elem -> { DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme()); if (DetlDto.has(detlDtos, detlDto)) { DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); assert one != null; one.setAnfme(one.getAnfme() + detlDto.getAnfme()); } else { detlDtos.add(detlDto); } }); for (DetlDto detlDto : detlDtos) { Mat mat = matService.selectByMatnr(detlDto.getMatnr()); WaitPakin waitPakin = new WaitPakin(); if (Cools.isEmpty(mat)) { MatV2 matV2 = matV2Service.selectOne(new EntityWrapper().eq("matnr", detlDto.getMatnr())); if(Cools.isEmpty(matV2)){ throw new CoolException(detlDto.getMatnr() + "商品档案不存在"); } waitPakin.sync(matV2); waitPakin.setBrand("组件"); } else { waitPakin.sync(mat); } waitPakin.setBatch(detlDto.getBatch()); waitPakin.setZpallet(param.getBarcode()); // 托盘码 waitPakin.setIoStatus("N"); // 入出状态 waitPakin.setAnfme(detlDto.getAnfme()); // 数量 waitPakin.setStatus("Y"); // 状态 waitPakin.setAppeUser(userId); waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } } // 关联组托 } else { for (CombParam.CombMat combMat : param.getCombMats()) { // 生成入库通知档 Order order = orderService.selectByNo(combMat.getOrderNo()); //判断订单类型是否是入库 DocType docType=docTypeService.selectById(order.getDocType()); if(docType.getPakin()!=1 || docType.getStatus()!=1){ throw new CoolException("订单为出库订单,不能组托!"); } if (order.getSettle() > 2) { throw new CoolException("单据编号已过期"); } OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch()); if (orderDetl == null) { throw new CoolException("找不到组托的单据明细"); } //订单数-工作中的数量-组托数量 if ( orderDetl.getAnfme() - orderDetl.getWorkQty() - combMat.getAnfme()<0) { throw new CoolException("组托数量已超出订单需求量,请检查是否有其他的组托已完成"); } // 修改订单作业数量 if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) { throw new CoolException("修改单据作业数量失败"); } Mat mat = matService.selectByMatnr(combMat.getMatnr()); if (Cools.isEmpty(mat)) { throw new CoolException(combMat.getMatnr() + "商品档案不存在"); } WaitPakin waitPakin = new WaitPakin(); waitPakin.sync(mat); waitPakin.setBomCode(combMat.getBomCode()); waitPakin.setOrderNo(order.getOrderNo()); // 单据编号 waitPakin.setBatch(combMat.getBatch()); // 序列码 waitPakin.setZpallet(param.getBarcode()); // 托盘码 waitPakin.setIoStatus("N"); // 入出状态 waitPakin.setAnfme(combMat.getAnfme()); // 数量 waitPakin.setStatus("Y"); // 状态 waitPakin.setAppeUser(userId); waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } // DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme()); // if (DetlDto.has(detlDtos, detlDto)) { // DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); // assert one != null; // one.setAnfme(one.getAnfme() + detlDto.getAnfme()); // } else { // } orderService.updateSettle(order.getId(), 2L, userId); } } } @Override @Transactional public void comb2(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); } if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){ throw new CoolException("入库物料数量不能为空"); } // 判断是否有相同条码的数据 if (waitPakinService.selectCount(new EntityWrapper(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { throw new CoolException(param.getBarcode() + "数据正在进行入库"); } int countLoc = locDetlService.selectCount(new EntityWrapper().eq("zpallet",param.getBarcode())); WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode()); if (wrkMast != null && wrkMast.getIoType() < 100){ throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode()); } if (countLoc > 0 ) { throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode()); } //设置非null批号, for (CombParam.CombMat combMat : param.getCombMats()) { if (combMat.getBatch() == null){ combMat.setBatch(""); } } Date now = new Date(); // 无单组托 if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) { // 生成入库通知档 List detlDtos = new ArrayList<>(); param.getCombMats().forEach(elem -> { DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme()); if (DetlDto.has(detlDtos, detlDto)) { DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); assert one != null; one.setAnfme(one.getAnfme() + detlDto.getAnfme()); } else { detlDtos.add(detlDto); } }); for (DetlDto detlDto : detlDtos) { Mat mat = matService.selectByMatnr(detlDto.getMatnr()); WaitPakin waitPakin = new WaitPakin(); if (Cools.isEmpty(mat)) { MatV2 matV2 = matV2Service.selectOne(new EntityWrapper().eq("matnr", detlDto.getMatnr())); if(Cools.isEmpty(matV2)){ throw new CoolException(detlDto.getMatnr() + "商品档案不存在"); } waitPakin.sync(matV2); waitPakin.setBrand("组件"); } else { waitPakin.sync(mat); } // 校验是否为bom入库 bom入库的数量不能超过库存原有数量 if (!Cools.isEmpty(param.getBomCode())) { BomMat bomMat = bomMatService.selectOne(new EntityWrapper().eq("bom_num", param.getBomCode()).eq("element_num", detlDto.getMatnr())); Double bomQyt = locDetlService.getBomQyt(param.getBomCode(), detlDto.getMatnr()); if (!Cools.isEmpty(bomQyt)) { bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt); } Double bomQty = wrkDetlService.getBomQty(param.getBomCode(), detlDto.getMatnr()); if (!Cools.isEmpty(bomQty)) { bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty); } if (bomMat.getZpalletAnfme() == 0.0D) { throw new CoolException(detlDto.getMatnr() + "当前物料已入最大数量"); } else { if (bomMat.getZpalletAnfme() < detlDto.getAnfme()) { throw new CoolException(detlDto.getMatnr() + "当前物料最多可入" + bomMat.getZpalletAnfme() + "件"); } } } waitPakin.setBatch(detlDto.getBatch()); waitPakin.setZpallet(param.getBarcode()); // 托盘码 waitPakin.setIoStatus("N"); // 入出状态 waitPakin.setAnfme(detlDto.getAnfme()); // 数量 waitPakin.setStatus("Y"); // 状态 waitPakin.setAppeUser(userId); waitPakin.setBomCode(param.getBomCode()); waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } } // 关联组托 } else { for (CombParam.CombMat combMat : param.getCombMats()) { // 生成入库通知档 Order order = orderService.selectByNo(combMat.getOrderNo()); //判断订单类型是否是入库 DocType docType=docTypeService.selectById(order.getDocType()); if(docType.getPakin()!=1 || docType.getStatus()!=1){ throw new CoolException("订单为出库订单,不能组托!"); } if (order.getSettle() > 2) { throw new CoolException("单据编号已过期"); } OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch()); if (orderDetl == null) { throw new CoolException("找不到组托的单据明细"); } //订单数-工作中的数量-组托数量 if ( orderDetl.getAnfme() - orderDetl.getWorkQty() - combMat.getAnfme()<0) { throw new CoolException("组托数量已超出订单需求量,请检查是否有其他的组托已完成"); } // 修改订单作业数量 if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) { throw new CoolException("修改单据作业数量失败"); } Mat mat = matService.selectByMatnr(combMat.getMatnr()); if (Cools.isEmpty(mat)) { throw new CoolException(combMat.getMatnr() + "商品档案不存在"); } WaitPakin waitPakin = new WaitPakin(); waitPakin.sync(mat); waitPakin.setOrderNo(order.getOrderNo()); // 单据编号 waitPakin.setBatch(combMat.getBatch()); // 序列码 waitPakin.setZpallet(param.getBarcode()); // 托盘码 waitPakin.setIoStatus("N"); // 入出状态 waitPakin.setAnfme(combMat.getAnfme()); // 数量 waitPakin.setStatus("Y"); // 状态 waitPakin.setAppeUser(userId); waitPakin.setAppeTime(now); waitPakin.setBomCode(param.getBomCode()); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } // DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme()); // if (DetlDto.has(detlDtos, detlDto)) { // DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); // assert one != null; // one.setAnfme(one.getAnfme() + detlDto.getAnfme()); // } else { // } orderService.updateSettle(order.getId(), 2L, userId); } } } @Override @Transactional public void comb3(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); } if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){ throw new CoolException("入库物料数量不能为空"); } // 判断是否有相同条码的数据 if (waitPakinService.selectCount(new EntityWrapper(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { throw new CoolException(param.getBarcode() + "数据正在进行入库"); } int countLoc = locDetlService.selectCount(new EntityWrapper().eq("zpallet",param.getBarcode())); WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode()); if (wrkMast != null && wrkMast.getIoType() < 100){ throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode()); } if (countLoc > 0 ) { throw new CoolException("工作档/库存条码数据已存在===>>" + param.getBarcode()); } //设置非null批号, for (CombParam.CombMat combMat : param.getCombMats()) { if (combMat.getBatch() == null){ combMat.setBatch(""); } } Date now = new Date(); // 无单组托 if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) { // 生成入库通知档 List detlDtos = new ArrayList<>(); param.getCombMats().forEach(elem -> { DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme()); if (DetlDto.has(detlDtos, detlDto)) { DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); assert one != null; one.setAnfme(one.getAnfme() + detlDto.getAnfme()); } else { detlDtos.add(detlDto); } }); for (DetlDto detlDto : detlDtos) { Mat mat = matService.selectByMatnr(detlDto.getMatnr()); WaitPakin waitPakin = new WaitPakin(); if (Cools.isEmpty(mat)) { MatV2 matV2 = matV2Service.selectOne(new EntityWrapper().eq("matnr", detlDto.getMatnr())); if(Cools.isEmpty(matV2)){ throw new CoolException(detlDto.getMatnr() + "商品档案不存在"); } waitPakin.sync(matV2); waitPakin.setBrand("组件"); } else { waitPakin.sync(mat); } // 校验是否为bom入库 bom入库的数量不能超过库存原有数量 if (!Cools.isEmpty(param.getBomCode())) { BomMat bomMat = bomMatService.selectOne(new EntityWrapper().eq("bom_num", param.getBomCode()).eq("element_num", detlDto.getMatnr())); Double bomQyt = locDetlService.getBomQyt(param.getBomCode(), detlDto.getMatnr()); if (!Cools.isEmpty(bomQyt)) { bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt); } Double bomQty = wrkDetlService.getBomQty(param.getBomCode(), detlDto.getMatnr()); if (!Cools.isEmpty(bomQty)) { bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty); } if (bomMat.getZpalletAnfme() == 0.0D) { throw new CoolException(detlDto.getMatnr() + "当前物料已入最大数量"); } else { if (bomMat.getZpalletAnfme() < detlDto.getAnfme()) { throw new CoolException(detlDto.getMatnr() + "当前物料最多可入" + bomMat.getZpalletAnfme() + "件"); } } } waitPakin.setBatch(detlDto.getBatch()); waitPakin.setZpallet(param.getBarcode()); // 托盘码 waitPakin.setIoStatus("N"); // 入出状态 waitPakin.setAnfme(detlDto.getAnfme()); // 数量 waitPakin.setStatus("Y"); // 状态 waitPakin.setAppeUser(userId); waitPakin.setBomCode(param.getBomCode()); waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } } // 关联组托 } else { for (CombParam.CombMat combMat : param.getCombMats()) { // 生成入库通知档 Order order = orderService.selectByNo(combMat.getOrderNo()); //判断订单类型是否是入库 DocType docType=docTypeService.selectById(order.getDocType()); if(docType.getPakin()!=1 || docType.getStatus()!=1){ throw new CoolException("订单为出库订单,不能组托!"); } if (order.getSettle() > 2) { throw new CoolException("单据编号已过期"); } OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch(), combMat.getBomCode(), combMat.getThreeCode()); if (orderDetl == null) { throw new CoolException("找不到组托的单据明细"); } //订单数-工作中的数量-组托数量 if ( orderDetl.getAnfme() - orderDetl.getWorkQty() - combMat.getAnfme()<0) { throw new CoolException("组托数量已超出订单需求量,请检查是否有其他的组托已完成"); } // 修改订单作业数量 if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getBomCode(),combMat.getThreeCode(), combMat.getAnfme())) { throw new CoolException("修改单据作业数量失败"); } Mat mat = matService.selectByMatnr(combMat.getMatnr()); if (Cools.isEmpty(mat)) { throw new CoolException(combMat.getMatnr() + "商品档案不存在"); } WaitPakin waitPakin = new WaitPakin(); waitPakin.sync(mat); waitPakin.setOrderNo(order.getOrderNo()); // 单据编号 waitPakin.setBomCode(combMat.getBomCode()); waitPakin.setThreeCode(combMat.getThreeCode()); waitPakin.setBatch(combMat.getBatch()); waitPakin.setIsFull(param.getIsFull().equals("1") ? "Y" : "N"); // 序列码 waitPakin.setZpallet(param.getBarcode()); // 托盘码 waitPakin.setIoStatus("N"); // 入出状态 waitPakin.setAnfme(combMat.getAnfme()); // 数量 waitPakin.setStatus("Y"); // 状态 waitPakin.setAppeUser(userId); waitPakin.setAppeTime(now); waitPakin.setModiUser(userId); waitPakin.setModiTime(now); if (!waitPakinService.insert(waitPakin)) { throw new CoolException("保存入库通知档失败"); } // DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme()); // if (DetlDto.has(detlDtos, detlDto)) { // DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); // assert one != null; // one.setAnfme(one.getAnfme() + detlDto.getAnfme()); // } else { // } orderService.updateSettle(order.getId(), 2L, userId); } } } @Override @Transactional public List checkFullplt(CombParam.CombMat param, Long userId) { // 查询包含待组托物料在库存中是否存在 List locDetls = locDetlService.selectList(new EntityWrapper() .eq("three_code", param.getThreeCode()) .eq("bom_code", param.getBomCode())); if (Cools.isEmpty(locDetls)) { throw new CoolException("库存中没有存在当前物料所使用的销售单号"); } ArrayList locMasts = new ArrayList<>(); locDetls.forEach(locDetl -> { LocMast locMast = locMastService.selectOne(new EntityWrapper().eq("loc_no", locDetl.getLocNo())); if (!Cools.isEmpty(locMast)) { if (!locMasts.contains(locMast)) { locMasts.add(locMast); } } }); return locMasts; } @Override @Transactional public void mergeComb(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); } if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){ throw new CoolException("入库物料数量不能为空"); } // 判断是否有相同条码的数据 if (waitPakinService.selectCount(new EntityWrapper(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { throw new CoolException(param.getBarcode() + "数据正在进行入库"); } int countLoc = locDetlService.selectCount(new EntityWrapper().eq("zpallet",param.getBarcode())); WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode()); //设置非null批号, for (CombParam.CombMat combMat : param.getCombMats()) { if (combMat.getBatch() == null){ combMat.setBatch(""); } } Date now = new Date(); for (CombParam.CombMat combMat : param.getCombMats()) { Mat mat = matService.selectByMatnr(combMat.getMatnr()); LocDetl locDetl = new LocDetl(); locDetl.sync(mat); locDetl.setLocNo(wrkMast.getSourceLocNo()); locDetl.setZpallet(param.getBarcode()); locDetl.setBomCode(param.getBomCode()); locDetl.setAnfme(combMat.getAnfme()); locDetl.setAppeTime(now); locDetl.setAppeUser(userId); locDetl.setModiTime(now); locDetl.setModiUser(userId); locDetlService.insert(locDetl); } } @Override @Transactional public void mergeComb2(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); } if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){ throw new CoolException("入库物料数量不能为空"); } // 判断是否有相同条码的数据 if (waitPakinService.selectCount(new EntityWrapper(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { throw new CoolException(param.getBarcode() + "数据正在进行入库"); } int countLoc = locDetlService.selectCount(new EntityWrapper().eq("zpallet",param.getBarcode())); WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode()); if (wrkMast.getWrkSts() != 14L) { throw new CoolException("当前托盘出库未完成!"); } //设置非null批号, for (CombParam.CombMat combMat : param.getCombMats()) { if (combMat.getBatch() == null){ combMat.setBatch(""); } } Date now = new Date(); for (CombParam.CombMat combMat : param.getCombMats()) { Mat mat = matService.selectByMatnr(combMat.getMatnr()); WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(mat); wrkDetl.setWrkNo(wrkMast.getWrkNo()); wrkDetl.setZpallet(param.getBarcode()); wrkDetl.setOrderNo(combMat.getOrderNo()); wrkDetl.setBatch(combMat.getBatch()); wrkDetl.setBomCode(combMat.getBomCode()); wrkDetl.setThreeCode(combMat.getThreeCode()); wrkDetl.setAnfme(combMat.getAnfme()); wrkDetl.setAppeTime(now); wrkDetl.setAppeUser(userId); wrkDetl.setModiTime(now); wrkDetl.setModiUser(userId); wrkDetl.setMemo("并板"); wrkDetlService.insert(wrkDetl); // 同步订单 OrderDetl orderDetl = orderDetlService.selectItem(combMat.getOrderNo(), combMat.getMatnr(), combMat.getBatch(), combMat.getBomCode(), combMat.getThreeCode()); orderDetl.setQty(orderDetl.getWorkQty() + combMat.getAnfme()); orderDetlService.update(orderDetl,new EntityWrapper() .eq("order_no", combMat.getOrderNo()) .eq("matnr", combMat.getMatnr()) .eq("batch", combMat.getBatch()) .eq("bom_code", combMat.getBomCode()) .eq("three_code", combMat.getThreeCode())); } } @Override @Transactional public void mergeOut(String locNo,String staNo, Long userId) { LocMast locMast = locMastService.selectOne(new EntityWrapper().eq("loc_no", locNo)); if (!locMast.getLocSts().equals("F")) { throw new CoolException("当前库位状态不是在库状态不能出库"); } List locDetls = locDetlService.selectList(new EntityWrapper().eq("loc_no", locNo)); // 获取库位明细 List locDetlDtos = new ArrayList<>(); for (LocDetl locDetl : locDetls) { locDetlDtos.add(new LocDetlDto(locDetl, locDetl.getAnfme())); } BasDevp basDevp = basDevpService.selectById(staNo); workService.stockOut(basDevp, locDetlDtos, IoWorkType.MERGE_OUT, userId); } @Override @Transactional public R checkBom(CheckBom param, Long userId) { return R.ok(); } // 商品上架 @Override public void onSale(CombParam param) { Date now = new Date(); // 获取库位号 String locno = param.getLocno(); Node node = nodeService.selectByUuid(locno); if (Cools.isEmpty(node)) { throw new CoolException(param.getLocno() + ":库位不存在"); } // 获取商品列表 for(CombParam.CombMat combMat : param.getCombMats()){ Mat mat = matService.selectByMatnr(combMat.getMatnr()); if (Cools.isEmpty(mat)){ throw new CoolException(combMat.getMatnr() + ":商品档案不存在!"); } if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme()==0){ throw new CoolException(combMat.getMatnr() + ":商品数量有误!"); } if (Cools.isEmpty(combMat.getBatch())){ // throw new CoolException(combMat.getMatnr() + ":商品批号有误!"); } ManLocDetl manLocDetl = new ManLocDetl(); manLocDetl.setLocNo(locno); manLocDetl.setNodeId(node.getId()); manLocDetl.setMaktx(mat.getMaktx()); manLocDetl.setMatnr(mat.getMatnr()); manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch()); manLocDetl.setAnfme(combMat.getAnfme()); manLocDetl.setModiTime(now); if (!manLocDetlService.insert(manLocDetl)) { throw new CoolException("商品上架失败!"); } } } // 商品下架 @Override public void offSale(OffSaleParam offSaleParam) { ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr()); if (Cools.isEmpty(manLocDetl)){ throw new CoolException("无此商品!"); } double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme(); if (anfme < 0) { throw new CoolException("商品库存不足!"); } else if (anfme == 0){ manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr()); } manLocDetlMapper.updateAnfme0(anfme,manLocDetl.getNodeId()); } // 查找商品 @Override @Transactional public void adjust(MobileAdjustParam param, Long userId) { BasDevp basDevp = basDevpService.selectById(param.getStaNo()); if (null == basDevp || basDevp.getWrkNo() == null) { throw new CoolException(param.getStaNo() + "盘点站无效"); } if (!param.getWrkNo().equals(basDevp.getWrkNo())) { throw new CoolException(param.getStaNo() + "盘点站更新,请重新检索"); } WrkMast wrkMast = wrkMastService.selectById(param.getWrkNo()); if (wrkMast.getWrkSts() < 10) { throw new CoolException("盘点无效,任务已盘点再入库"); } Date now = new Date(); List wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); List list = param.getWrkDetls(); // 修改数量 Iterator iterator = wrkDetls.iterator(); while (iterator.hasNext()) { WrkDetl wrkDetl = iterator.next(); Iterator iterator1 = list.iterator(); while (iterator1.hasNext()) { WrkDetl wrkDetl1 = iterator1.next(); if (wrkDetl1.getAnfme() == 0) { iterator1.remove(); } if (wrkDetl.getMatnr().equals(wrkDetl1.getMatnr()) && Cools.eq(wrkDetl.getBatch(), wrkDetl1.getBatch())) { if (!wrkDetl.getAnfme().equals(wrkDetl1.getAnfme())) { // todo 盘点记录、保存调整记录 // 修改明细 if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) { throw new CoolException(wrkMast.getWrkNo() + "盘点任务," + wrkDetl.getMatnr() + "商品," + wrkDetl.getBatch() + "批号修改数量失败"); } } iterator.remove(); iterator1.remove(); } } } // 删除明细 for (WrkDetl wrkDetl : wrkDetls) { // todo 盘点记录、保存调整记录 if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) { throw new CoolException("删除" + wrkMast.getWrkNo() + "盘点任务," + wrkDetl.getMatnr() + "商品," + wrkDetl.getBatch() + "批号任务明细失败"); } } // 添加明细 for (WrkDetl wrkDetl : list) { if (wrkDetl.getAnfme() == 0.0D) { continue; } // todo 盘点记录、保存调整记录 String orderNo = wrkDetl.getOrderNo(); Mat mat = matService.selectByMatnr(wrkDetl.getMatnr()); wrkDetl.sync(mat); wrkDetl.setOrderNo(orderNo); wrkDetl.setModiTime(now); wrkDetl.setModiUser(userId); wrkDetl.setAppeTime(now); wrkDetl.setAppeUser(userId); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("添加" + wrkMast.getWrkNo() + "盘点任务," + wrkDetl.getMatnr() + "商品," + wrkDetl.getBatch() + "批号任务明细失败"); } } // 修改盘点任务主档状态 wrkMast.setFullPlt(wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()).size() != 0?"Y":"N"); wrkMast.setModiTime(now); wrkMast.setModiUser(userId); if (!wrkMastService.updateById(wrkMast)) { throw new CoolException("修改盘点任务主档失败"); } } // @Override // @Transactional // public void packComb(CombParam param, Long userId) { // if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { // throw new CoolException(BaseRes.PARAM); // } // // 判断是否有相同条码的数据 // if (waitPakinService.selectCount(new EntityWrapper(). // eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { // throw new CoolException(param.getBarcode() + "数据正在进行入库"); // } // Date now = new Date(); // // boolean packDown = Parameter.get().getPackDown().equals("true"); // // // 无单组托 // if (Cools.isEmpty(param.getOrderNo())) { // // // 生成入库通知档 // List detlDtos = new ArrayList<>(); // param.getCombMats().forEach(elem -> { // // 打包上线数据校验 // if (packDown) { // Pack pack = packService.selectByBarcode(elem.getMatnr()); // if (pack == null) { // throw new CoolException(elem.getMatnr() + "条码冗余,请检查!"); // } // if (pack.getSettle() != 1) { // throw new CoolException(elem.getMatnr() + "条码已下线,请检查!"); // } // } // Mat analyse = MatUtils.analyseMat(elem.getMatnr()); // // 条码、物料代码、序列号、数量 // DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme()); //// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme()); // if (DetlDto.has(detlDtos, detlDto)) { // DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); // assert one != null; // one.setAnfme(one.getAnfme() + detlDto.getAnfme()); // } else { // detlDtos.add(detlDto); // } // }); // // if (packDown) { // MesCombParam mesCombParam = new MesCombParam(); // mesCombParam.setZpallet(param.getBarcode()); // mesCombParam.setPakinTime(DateUtils.convert(now)); // mesCombParam.setLgort("5008"); // mesCombParam.setPlantCode("5000"); // mesCombParam.setFromCode("5012-20"); // mesCombParam.setStationCode("JJQ-PFZPDB-XX"); // for (DetlDto detlDto : detlDtos) { // mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme())); // } // String response = ""; // boolean success = false; // try { // response = new HttpHandler.Builder() // .setUri(MesConstant.URL) // .setPath(MesConstant.PACK_DOWN_URL) // .setJson(JSON.toJSONString(mesCombParam)) // .build() // .doPost(); // JSONObject jsonObject = JSON.parseObject(response); // if (jsonObject.getInteger("code").equals(200)) { // success = true; // } else if (jsonObject.getInteger("code").equals(500)) { // log.error("请求接口失败!!!url:{};request:{};response:{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); // throw new CoolException(jsonObject.getString("msg")); // } else { // log.error("请求接口失败!!!url:{};request:{};response:{}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response); // throw new CoolException("上报mes系统失败"); // } // } catch (Exception e) { // log.error("fail", e); // throw new CoolException(e.getMessage()); // } finally { // try { // // 保存接口日志 // apiLogService.save( // "打包下线帮托上报", // MesConstant.URL + MesConstant.PACK_DOWN_URL, // null, // "127.0.0.1", // JSON.toJSONString(mesCombParam), // response, // success // ); // } catch (Exception e) { log.error("", e); } // } // // } // // // 生成入库单据 // String orderNo = "PACK" + snowflakeIdWorker.nextId(); // OpenOrderPakinParam openParam = new OpenOrderPakinParam(); // openParam.setOrderNo(orderNo); // openParam.setOrderTime(DateUtils.convert(now)); // openParam.setOrderType("打包入库单"); // openParam.setOrderDetails(detlDtos); // openService.pakinOrderCreate(openParam); // Order order = orderService.selectByNo(orderNo); // if (null == order) { // throw new CoolException("生成单据失败"); // } // if (!orderService.updateSettle(order.getId(), 2L, userId)) { // throw new CoolException("修改单据状态失败"); // } // // // 生成入库通知档 // for (DetlDto detlDto : detlDtos) { // // // 修改作业数量 ---------------------------------------- // // 订单明细数量校验 // OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch()); // if (detlDto.getAnfme() > orderDetl.getEnableQty()) { // throw new CoolException(orderDetl.getMatnr() + "入库数量不合法"); // } // // 修改订单作业数量 // if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) { // throw new CoolException("修改单据作业数量失败"); // } // // // 保存入库通知档 // Mat mat = matService.selectByMatnr(detlDto.getMatnr()); // if (Cools.isEmpty(mat)) { // throw new CoolException(detlDto.getMatnr() + "商品档案不存在"); // } // WaitPakin waitPakin = new WaitPakin(); // waitPakin.sync(mat); // waitPakin.setOrderNo(orderNo); // waitPakin.setBatch(detlDto.getBatch()); // waitPakin.setZpallet(param.getBarcode()); // 托盘码 // waitPakin.setIoStatus("N"); // 入出状态 // waitPakin.setAnfme(detlDto.getAnfme()); // 数量 // waitPakin.setStatus("Y"); // 状态 // waitPakin.setAppeUser(userId); // waitPakin.setAppeTime(now); // waitPakin.setModiUser(userId); // waitPakin.setModiTime(now); // if (!waitPakinService.insert(waitPakin)) { // throw new CoolException("保存入库通知档失败"); // } // // 修改打包数据状态 // Pack pack = packService.selectByBarcode(detlDto.getOrderNo()); // pack.setSettle(2L); // pack.setUpdateTime(now); // pack.setUpdateBy(userId); // if (!packService.updateById(pack)) { // throw new CoolException("修改打包数据异常"); // } // } // // } // } @Override @Transactional public void pakoutByOrder(JSONObject param, Long userId) { Integer staNo = param.containsKey("staNo") ? Integer.parseInt(param.get("staNo").toString()) : 0; String orderNo = param.containsKey("orderNo") ? param.get("orderNo").toString() : ""; BasDevp sta = basDevpService.checkSiteStatus(staNo); //根据订单号生成出库任务工作档 Order order = orderService.selectOne(new EntityWrapper().eq("order_no", orderNo)); if (order.getSettle() != 1 && order.getSettle() != 2){ throw new CoolException("该订单已处理"); } List orderDetls = orderDetlService.selectList(new EntityWrapper().eq("order_no", orderNo)); Date now = new Date(); for(OrderDetl orderDetl : orderDetls){ //查询所有库位状态为F的库位信息 List locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null); if (locDetls.size() == 0) { throw new CoolException("库存中没有该物料"); } for(LocDetl locDetl : locDetls){ //如果该库位出库路线所用的堆垛机out_enable不为Y,跳过该循环 LocMast locMast = locMastService.selectOne(new EntityWrapper() .eq("loc_no", locDetl.getLocNo())); if (Cools.isEmpty(locMast)) { continue; } BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper() .eq("crn_no", locMast.getCrnNo())); if (Cools.isEmpty(crn_no) || !crn_no.getOutEnable().equals("Y")){ continue; } //可出库数量 = 订单数量 - 作业中数量 Double outQty = orderDetl.getAnfme() - orderDetl.getWorkQty(); if(outQty <= 0){ break; } // 判断入出库类型:101.全板出库 or 103.拣料出库 Double sumCount = locDetlService.getLocDetlSumQty(locDetl.getLocNo()); Double curOutQty = outQty >= locDetl.getAnfme() ? locDetl.getAnfme() : outQty; //本次出库量 int ioType = sumCount <= curOutQty ? 101 : 103; stockOut(orderDetl, sta, locDetl, curOutQty, ioType, userId, now); order.setSettle(2L); order.setUpdateBy(userId); order.setUpdateTime(now); if(!orderService.update(order, new EntityWrapper().eq("order_no", orderNo))){ throw new CoolException("更新订单状态失败"); } orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty); orderDetl.setUpdateBy(userId); orderDetl.setUpdateTime(now); Wrapper wrapper = new EntityWrapper().eq("order_no", orderNo) .eq("matnr",orderDetl.getMatnr()); if(!Cools.isEmpty(orderDetl.getBatch())){ wrapper.eq("batch", orderDetl.getBatch()); } if(!orderDetlService.update(orderDetl, wrapper)){ throw new CoolException("更新订单明细失败"); } } } } @Override @Transactional public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl, Double curOutQty, Integer ioType, Long userId, Date now) { // 获取库位 LocMast locMast = locMastService.selectById(locDetl.getLocNo()); // 获取路径 Wrapper wrapper = new EntityWrapper() .eq("type_no", ioType) .eq("stn_no", staNo.getDevNo()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("出库路径不存在"); } // 生成工作号 int workNo = commonService.getWorkNo(2); // 生成工作档 WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(now); wrkMast.setWrkSts(11L); // 工作状态:11.生成出库ID wrkMast.setIoType(ioType); // 入出库状态 wrkMast.setIoPri(13D); // 优先级:13 wrkMast.setCrnNo(locMast.getCrnNo()); wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站 wrkMast.setStaNo(staDesc.getStnNo()); // 目标站 wrkMast.setSourceLocNo(locDetl.getLocNo()); // 源库位 wrkMast.setFullPlt("Y"); // 满板:Y wrkMast.setPicking("N"); // 拣料 wrkMast.setExitMk("N"); // 退出 wrkMast.setEmptyMk("N"); // 空板 wrkMast.setLinkMis("N"); wrkMast.setAppeUser(userId); // 操作人员数据 wrkMast.setAppeTime(now); wrkMast.setModiUser(userId); wrkMast.setModiTime(now); wrkMast.setBarcode(locMast.getBarcode()); if (!wrkMastService.insert(wrkMast)) { throw new CoolException("保存工作档失败,出库库位号:" + locDetl.getLocNo()); } WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(locDetl); wrkDetl.setWrkNo(workNo); wrkDetl.setIoTime(now); wrkDetl.setAnfme(curOutQty); // 数量 wrkDetl.setOrderNo(orderDetl.getOrderNo()); wrkDetl.setAppeTime(now); wrkDetl.setAppeUser(userId); wrkDetl.setModiTime(now); wrkDetl.setModiUser(userId); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("保存工作档明细失败"); } // 修改库位状态: F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中 locMast = locMastService.selectById(locDetl.getLocNo()); if (locMast.getLocSts().equals("F")) { locMast.setLocSts(ioType == 101 ? "R" : "P"); locMast.setModiUser(userId); locMast.setModiTime(new Date()); if (!locMastService.updateById(locMast)) { throw new CoolException("预约库位状态失败,库位号:" + locDetl.getLocNo()); } } else { throw new CoolException(locDetl.getLocNo() + "库位不是在库状态"); } } @Transactional @Override public R manDetlIn(JSONObject json) { Date date = new Date(); String jsonLocNo = (String) json.get("locNo"); Node node = nodeService.selectOne(new EntityWrapper() .eq("name", jsonLocNo)); JSONArray combMats = json.getJSONArray("combMats"); for (int i = 0; i < combMats.size(); i++) { OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class); //查订单 Order order = orderService.selectOne(new EntityWrapper() .eq("order_no", jsonOrderDetl.getOrderNo())); if (Cools.isEmpty(node, order)) { return R.error("参数为空"); } //判断订单类型是否是入库 DocType docType=docTypeService.selectById(order.getDocType()); if(docType.getPakin()!=1 || docType.getStatus()!=1){ return R.error("该订单是出库订单,无法入库"); } OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getBatch()); if (Cools.isEmpty(orderDetl)) { return R.error("单据明细有误,请检查"); } if (Cools.isEmpty(orderDetl.getAnfme())) { return R.error("数量为空!"); } if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 0) { return R.error("入库数量大于可入数量"); } //查询平库中是否有一样的物料号,有的话直接增加数量 ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch()); if (checkManLocDetl == null) { ManLocDetl manLocDetl = new ManLocDetl(); Synchro.Copy(orderDetl, manLocDetl); manLocDetl.setLocNo(node.getName()); manLocDetl.setNodeId(node.getId()); manLocDetl.setMatnr(orderDetl.getMatnr()); manLocDetl.setMaktx(jsonOrderDetl.getMaktx()); manLocDetl.setAnfme(jsonOrderDetl.getAnfme()); manLocDetl.setModiTime(date); manLocDetl.setCreateTime(date); manLocDetl.setBatch(jsonOrderDetl.getBatch()); if(!manLocDetlService.insert(manLocDetl)){ return R.error("修改平库物料失败!"); } } else { if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(), jsonOrderDetl.getOrderNo(), jsonOrderDetl.getMaktx(), jsonOrderDetl.getBatch())<=0){ return R.error("修改平库物料失败!"); } } orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme()); orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme()); orderDetl.setUpdateTime(date); orderDetlService.updateById(orderDetl); //更新订单状态 List orderDetls=orderDetlService.selectList(new EntityWrapper().eq("order_no",order.getOrderNo())); order.setSettle(2L); boolean log=true; for (OrderDetl orderDetl1: orderDetls) { //工作中的数量小于总订单数时,订单状态改为2,作业中 if(orderDetl1.getQty() < orderDetl.getAnfme()){ log=false; } } if(log){ order.setSettle(4L); } if(!orderService.updateById(order)){ return R.error("更新订单状态失败"); } orderService.checkComplete(order.getOrderNo()); } return R.ok("上架完成"); } @Transactional @Override public R manDetlOut(JSONObject json) { Date date = new Date(); String jsonLocNo = (String) json.get("locNo"); Node node = nodeService.selectOne(new EntityWrapper() .eq("name", jsonLocNo)); JSONArray combMats = json.getJSONArray("combMats"); for (int i = 0; i < combMats.size(); i++) { OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class); Order order = orderService.selectOne(new EntityWrapper() .eq("order_no", jsonOrderDetl.getOrderNo())); //判断订单类型是否是出库 DocType docType=docTypeService.selectById(order.getDocType()); if(docType.getPakout()!=1 || docType.getStatus()!=1){ return R.error("该订单是入库订单,无法出库"); } if (Cools.isEmpty(node, order)) { return R.error("参数为空"); } OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getBatch()); if (Cools.isEmpty(orderDetl)) { return R.error("单据明细有误,请检查"); } if (jsonOrderDetl.getAnfme() > (orderDetl.getAnfme() - orderDetl.getWorkQty())) { return R.error("出库数量大于单据可出数量"); } //查询平库中是否有一样的物料号 ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),orderDetl.getBatch()); if (checkManLocDetl == null) { return R.error("该库位没有出库的物料信息"); } if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) { return R.error("出库数量大于可出数量"); } Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme(); if (finalQty <= 0){ if(manLocDetlService.deleteDatailed(jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){ return R.error("修改平库物料失败!"); } }else { if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){ return R.error("修改平库物料失败!"); } } orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme()); orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme()); orderDetl.setUpdateTime(date); orderDetlService.updateById(orderDetl); //更新订单状态 List orderDetls=orderDetlService.selectList(new EntityWrapper().eq("order_no",order.getOrderNo())); order.setSettle(2L); boolean log=true; for (OrderDetl orderDetl1: orderDetls) { //工作中的数量小于总订单数时,订单状态改为2,作业中 if(orderDetl1.getQty() < orderDetl.getAnfme()){ log=false; } } if(log){ order.setSettle(4L); } if(!orderService.updateById(order)){ return R.error("更新订单状态失败"); } orderService.checkComplete(order.getOrderNo()); } return R.ok("下架完成"); } @Override @Transactional public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) { Date now = new Date(); WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper().eq("barcode", param.getBarcode())); if (Cools.isEmpty(wrkMast)){ throw new CoolException("托盘码:"+param.getBarcode()+" 无有效工作档"); }else if (wrkMast.getIoType()!=103){ throw new CoolException("托盘码:"+param.getBarcode()+" 所属工作档非拣料任务"); }else if (wrkMast.getWrkSts()!=14.0){ throw new CoolException("托盘码:"+param.getBarcode()+" 所属工作档工作状态不是出库完成"); } // List wrkDetls = wrkDetlService.selectList(new EntityWrapper().eq("zpallet", param.getBarcode())); List wrkDetls = param.getWrkDetls(); for (WrkDetl wrkDetl : wrkDetls) { wrkDetl.setWrkNo(wrkMast.getWrkNo()); wrkDetl.setZpallet(param.getBarcode()); wrkDetl.setMatnr("B"+wrkDetl.getMatnr()); wrkDetl.setAnfme(-wrkDetl.getAnfme()); wrkDetl.setAppeTime(now); wrkDetl.setAppeUser(userId); wrkDetl.setModiTime(now); wrkDetl.setModiUser(userId); wrkDetlService.insert(wrkDetl); } } }