package com.zy.asrs.wms.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zy.asrs.common.domain.dto.LocDetlDto; import com.zy.asrs.common.domain.dto.WrkDto; import com.zy.asrs.common.domain.entity.MobileAdjustResult; import com.zy.asrs.common.domain.entity.StaDesc; import com.zy.asrs.common.domain.enums.WorkNoType; import com.zy.asrs.common.domain.param.MobileAdjustParam; import com.zy.asrs.common.domain.param.PickConfirmParam; import com.zy.asrs.common.domain.param.PickMatParam; import com.zy.asrs.common.openapi.entity.param.CombParam; import com.zy.asrs.common.openapi.entity.param.WarehouseOutMergeBoardManyParam; import com.zy.asrs.common.openapi.entity.param.WarehouseOutPickMergeParam; import com.zy.asrs.common.sys.service.StaDescService; import com.zy.asrs.common.web.BaseController; import com.zy.asrs.common.wms.entity.*; import com.zy.asrs.common.wms.service.*; import com.zy.asrs.framework.annotations.ManagerAuth; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.*; import java.util.stream.Collectors; /** * 移动端接口控制器 */ @RestController @RequestMapping("mobile") public class MobileController extends BaseController { @Autowired private MobileService mobileService; @Autowired private OrderService orderService; @Autowired private DocTypeService docTypeService; @Autowired private WrkDetlService wrkDetlService; @Autowired private WrkMastService wrkMastService; @Autowired private LocDetlService locDetlService; @Autowired private BasDevpService basDevpService; @Autowired private RolePermissionService rolePermissionService; @Autowired private PermissionService permissionService; @Autowired private LocMastService locMastService; @Autowired private StaDescService staDescService; @Autowired private OrderDetlService orderDetlService; @Autowired private CommonService commonService; @Autowired private MatService matService; /** * 平庫上架 * * @param locNo * @param barcode * @return */ @RequestMapping("/pda/WarehouseIn") @ManagerAuth public R WarehouseIn(@RequestParam String locNo, @RequestParam String barcode) { return mobileService.WarehouseIn(locNo, barcode, getHostId(), getUserId()); } /** * 平庫下架 * * @param combParam * @return */ @RequestMapping("/pda/WarehouseOut") @ManagerAuth public R WarehouseOut(@RequestBody CombParam combParam) { return mobileService.WarehouseOut(combParam, getHostId(), getUserId()); } @RequestMapping("/outBound/mat/list") @ManagerAuth public R WarehouseMat(@RequestParam String matnr, @RequestParam String orderNo) { if (Cools.isEmpty(matnr)) { R.error("品号不能为空"); } ArrayList maps = new ArrayList<>(); if (Cools.isEmpty(orderNo)) { List list = orderDetlService.list(new LambdaQueryWrapper() .eq(OrderDetl::getMatnr, matnr) .orderByDesc(OrderDetl::getCreateTime)); List orderDetls = new ArrayList(); for (OrderDetl orderDetl : list ) { Order order = orderService.getOne(new LambdaQueryWrapper().eq(Order::getOrderNo, orderDetl.getOrderNo())); if (!Cools.isEmpty(order)) { DocType docType = docTypeService.getOne(new LambdaQueryWrapper().eq(DocType::getDocId, order.getDocType())); if (!Cools.isEmpty(docType) && docType.getPakout() == 1) { double count = orderDetl.getAnfme() - orderDetl.getWorkQty(); PickMatParam matParam = new PickMatParam(); matParam.setMatnr(orderDetl.getMatnr()); matParam.setBatch(orderDetl.getBatch()); matParam.setOrderNo(orderDetl.getOrderNo()); matParam.setOrderId(orderDetl.getOrderId()); matParam.setCount(count); matParam.setUseCount(count); maps.add(matParam); } } } return R.ok(maps); } else { List list = orderDetlService.list(new LambdaQueryWrapper() .eq(OrderDetl::getMatnr, matnr) .like(OrderDetl::getOrderNo, orderNo) .orderByDesc(OrderDetl::getCreateTime)); for (OrderDetl orderDetl : list ) { double count = orderDetl.getAnfme() - orderDetl.getWorkQty(); PickMatParam matParam = new PickMatParam(); matParam.setMatnr(orderDetl.getMatnr()); matParam.setBatch(orderDetl.getBatch()); matParam.setOrderNo(orderDetl.getOrderNo()); matParam.setOrderId(orderDetl.getOrderId()); matParam.setCount(count); matParam.setUseCount(count); maps.add(matParam); } return R.ok(maps); } } /** * 并板途中拣料 * * @param combParam * @return */ @RequestMapping("/pda/WarehouseOut/v1") @ManagerAuth public R WarehouseOutV1(@RequestBody CombParam combParam) { return mobileService.WarehouseOutV1(combParam, getHostId(), getUserId()); } /** * 拣料途中并板 * * @param param * @return */ @RequestMapping("/pda/WarehouseOutPickMerge/v1") @ManagerAuth public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) { return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId()); } /** * 多次并板 * * @param param * @return */ @RequestMapping("/pda/WarehouseOutMergeBoardMany/v1") @ManagerAuth public R WarehouseOutMergeBoardManyV1(@RequestBody WarehouseOutMergeBoardManyParam param) { return mobileService.WarehouseOutMergeBoardMany(param, getHostId(), getUserId()); } @RequestMapping("/menu/pda/auth") @ManagerAuth public R menuPda() { List rolePermissions; Long roleId = getUser().getRoleId(); rolePermissions = rolePermissionService.list(new LambdaQueryWrapper().eq(RolePermission::getRoleId, getHostId())); if (Cools.isEmpty(rolePermissions)) { return R.ok(); } List collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList()); List permissions = permissionService.listByIds(collect); return R.ok().add(permissions); } /** * 入库制令检测 -- 指令在库存里面借用批号字段batch * 1.可正常入库 * 2.库存包含相同制令货物，是否进行补货 * 3.工作档存在正在入库任务，拒绝入库 */ @RequestMapping("/pda/decrees/check") @ManagerAuth public R pdaDecreesCheck(@RequestParam String decrees) { if (Cools.isEmpty(decrees)) { return R.error("制令不能为空"); } Long hostId = getHostId(); //查询是否有库存 List list = locDetlService.list(new LambdaQueryWrapper().eq(LocDetl::getBatch, decrees)); //查询是否有正在工作的工作档 List wrkDetls = wrkDetlService.list(new LambdaQueryWrapper().eq(WrkDetl::getBatch, decrees)); HashMap map = new HashMap<>(); if (list.isEmpty() && wrkDetls.isEmpty()) { map.put("status", 1);//可正常入库 } else if (!wrkDetls.isEmpty()) { map.put("status", 3);//存在工作档，拒绝入库 } else { //获取库存最少的一条记录 Double anfme = 999999999D; LocDetl miniLocDetl = null; for (LocDetl locDetl : list) { if (locDetl.getAnfme() < anfme) { anfme = locDetl.getAnfme(); miniLocDetl = locDetl; } } map.put("status", 2);//库存包含相同制令货物，是否进行补货 map.put("data", miniLocDetl);//库存信息 } return R.ok().add(map); } /** * 根据单号检索单据数据 */ @RequestMapping("/order/search/orderNo/auth") @ManagerAuth public R orderSearchByBarcode(@RequestParam String orderNo) { Order order = orderService.selectByNo(orderNo, getHostId()); if (order == null) { return R.ok(); } DocType docType = docTypeService.getById(order.getDocType()); if (docType.getPakin() == null || docType.getPakin() != 1) { return R.ok(); } if (order.getSettle() > 2) { return R.ok(); } List orderDetls = orderService.selectWorkingDetls(order.getId()); if (Cools.isEmpty(orderDetls)) { return R.ok(); } return R.ok().add(orderDetls); } @RequestMapping("/comb/auth") @ManagerAuth(memo = "组托") public R comb(@RequestBody CombParam combParam) { mobileService.comb(combParam, getUserId(), getHostId()); return R.ok("组托成功"); } @RequestMapping("/pakout/query/auth") @ManagerAuth @Deprecated public R pakoutQuery(@RequestParam(required = false) String barcode, @RequestParam(required = false) Integer staNo, @RequestParam(required = false) String matnr) { if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) { return R.ok(); } Long hostId = getHostId(); if (!Cools.isEmpty(barcode)) { List wrkDetls = wrkDetlService.list(new LambdaQueryWrapper().eq(WrkDetl::getZpallet, barcode).eq(WrkDetl::getHostId, hostId)); return R.ok().add(wrkDetls); } if (!Cools.isEmpty(matnr)) { if (!Cools.isEmpty(staNo)) { List wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr, hostId); return R.ok().add(wrkDetls); } } return R.ok(); } /** * 出库确认 - 扫托盘码 * 1.全板 返回 101 * 2.拣料 返回 103 */ @RequestMapping("/pakout/confirm/barcode/auth") @ManagerAuth public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode) { if (Cools.isEmpty(barcode)) { return R.ok(); } Long hostId = getHostId(); WrkMast wrkMast = wrkMastService.selectByBarcode(barcode, hostId); if (wrkMast != null) { List wrkDetls = wrkDetlService.list(new LambdaQueryWrapper().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId)); // 去除已出库确认的明细 wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0); return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls)); } return R.ok(); } /** * 出库确认 - 拣料出库 - 选择具体条码商品 */ @RequestMapping("/pakout/confirm/pick/auth") @ManagerAuth public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo , @RequestParam(required = false) String matnr) { if (Cools.isEmpty(wrkNo)) { return R.ok(); } if (Cools.isEmpty(matnr)) { return R.ok(); } Long hostId = getHostId(); WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper().eq(WrkMast::getWrkNo, wrkNo).eq(WrkMast::getHostId, hostId)); if (wrkMast == null) { return R.ok(); } String orderNo = null; List wrkDetls = wrkDetlService.list(new LambdaQueryWrapper().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId)); for (WrkDetl wrkDetl : wrkDetls) { if (Cools.isEmpty(orderNo)) { orderNo = wrkDetl.getOrderNo(); } if ((wrkDetl.getMatnr() + "-" + wrkDetl.getBatch()).equals(matnr)) { return R.ok().add(wrkDetl); } } // 替换 明细 List locDetls = locDetlService.list(new LambdaQueryWrapper().eq(LocDetl::getLocNo, wrkMast.getSourceLocNo()).eq(LocDetl::getHostId, hostId)); for (LocDetl locDetl : locDetls) { if ((locDetl.getMatnr() + "-" + locDetl.getBatch()).equals(matnr)) { WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(locDetl); wrkDetl.setOrderNo(orderNo); wrkDetl.setIoTime(wrkMast.getIoTime()); wrkDetl.setWrkNo(wrkNo); return R.ok().add(wrkDetl); } } return R.error("系统错误，条码不存在"); } @RequestMapping("/pakout/confirm/auth") @ManagerAuth @Transactional public R pakoutConfirm(@RequestBody List list) { if (Cools.isEmpty(list)) { return R.ok(); } Long hostId = getHostId(); Set wrkNos = new HashSet<>(); List dtos = new ArrayList<>(); for (WrkDetl wrkDetl : list) { if (wrkNos.contains(wrkDetl.getWrkNo())) { for (WrkDto dto : dtos) { if (dto.getWrkNo().equals(wrkDetl.getWrkNo())) { dto.getWrkDetls().add(wrkDetl); break; } } } else { wrkNos.add(wrkDetl.getWrkNo()); dtos.add(new WrkDto(wrkDetl.getWrkNo(), wrkDetl)); } } for (WrkDto dto : dtos) { WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper().eq(WrkMast::getWrkNo, dto.getWrkNo()).eq(WrkMast::getHostId, hostId)); if (wrkMast != null) { // 101 if (wrkMast.getIoType() == 101) { for (WrkDetl wrkDetl : dto.getWrkDetls()) { wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId); } } // 103 if (wrkMast.getIoType() == 103) { if (!wrkDetlService.remove(new LambdaQueryWrapper().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId))) { throw new CoolException("拣料出库确认失败"); } for (WrkDetl wrkDetl : dto.getWrkDetls()) { wrkDetl.setInspect(1); if (!wrkDetlService.save(wrkDetl)) { throw new CoolException("拣料出库确认失败"); } } } } } for (Integer wrkNo : wrkNos) { WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper().eq(WrkMast::getWrkNo, wrkNo).eq(WrkMast::getHostId, hostId)); if (wrkMast.getWrkSts() == 14 && (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N"))) { List wrkDetls = wrkDetlService.list(new LambdaQueryWrapper().eq(WrkDetl::getWrkNo, wrkNo).eq(WrkDetl::getHostId, hostId)); boolean complete = true; for (WrkDetl wrkDetl : wrkDetls) { if (wrkDetl.getInspect() == null || wrkDetl.getInspect() == 0) { complete = false; break; } } if (complete) { wrkMast.setInvWh("Y"); wrkMast.setModiTime(new Date()); if (!wrkMastService.updateById(wrkMast)) { throw new CoolException("修改工作档" + wrkNo + "失败"); } } } } return R.ok("完成确认"); } // 盘点 ---------------------------------------------------------------------------------------------------- @RequestMapping("/checkDetl/auth") @ManagerAuth public R getCheckDetl(@RequestParam(required = false) Integer staNo) { if (null == staNo || staNo == 0) { return R.ok(); } Long hostId = getHostId(); BasDevp basDevp = basDevpService.getOne(new LambdaQueryWrapper().eq(BasDevp::getDevNo, staNo).eq(BasDevp::getHostId, hostId)); if (null != basDevp && basDevp.getWrkNo() != null) { WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper().eq(WrkMast::getWrkNo, basDevp.getWrkNo()).eq(WrkMast::getHostId, hostId)); if (wrkMast != null && wrkMast.getIoType() == 107) { List wrkDetls = wrkDetlService.list(new LambdaQueryWrapper().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId)); if (!Cools.isEmpty(wrkDetls)) { MobileAdjustResult result = new MobileAdjustResult(); result.setStaNo(staNo); result.setWrkNo(wrkMast.getWrkNo()); result.setWrkDetls(wrkDetls); return R.ok().add(result); } } } return R.ok(); } @RequestMapping("/adjust/auth") @ManagerAuth(memo = "盘点") public R adjust(@RequestBody MobileAdjustParam combParam) { mobileService.adjust(combParam, getUserId(), getHostId()); return R.ok("盘点成功"); } @RequestMapping("/loc/f/list") @ManagerAuth(memo = "获取在库库位") public R locNoF(@RequestParam(required = false) String locNo) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(LocMast::getLocSts, "F") .eq(LocMast::getHostId, getHostId()); if (!Cools.isEmpty(locNo)) { wrapper.like(LocMast::getLocNo, locNo); } List list = locMastService.list(wrapper); return R.ok().add(list); } @RequestMapping("/pick/sta/list") @ManagerAuth(memo = "获取并板站") public R pickSta() { List list = staDescService.list(new LambdaQueryWrapper() .eq(StaDesc::getTypeNo, 104) .eq(StaDesc::getHostId, getHostId())); return R.ok().add(list); } @RequestMapping("/pick/mat/list") @ManagerAuth(memo = "获取并板物料") public R pickMats(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) { List docTypes = docTypeService.list(new LambdaQueryWrapper().like(DocType::getPakin, 1)); ArrayList typeList = new ArrayList<>(); for (DocType docType : docTypes) { typeList.add(docType.getDocId()); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Order::getStatus, 1); wrapper.eq(Order::getHostId, getHostId()); wrapper.in(Order::getDocType, typeList); List orders = orderService.list(wrapper); ArrayList orderIds = new ArrayList<>(); for (Order order : orders) { orderIds.add(order.getId()); } //搜索明细 LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(OrderDetl::getStatus, 1); wrapper1.eq(OrderDetl::getHostId, getHostId()); wrapper1.in(OrderDetl::getOrderId, orderIds); wrapper1.orderByDesc(OrderDetl::getCreateTime); if (!Cools.isEmpty(matnr)) { wrapper1.like(OrderDetl::getMatnr, matnr); } if (!Cools.isEmpty(orderNo)) { wrapper1.like(OrderDetl::getOrderNo, orderNo); } List list = orderDetlService.list(wrapper1); ArrayList maps = new ArrayList<>(); for (OrderDetl orderDetl : list) { //剩余可用数量 double count = orderDetl.getAnfme() - orderDetl.getWorkQty(); if (count <= 0) { continue; } PickMatParam matParam = new PickMatParam(); matParam.setMatnr(orderDetl.getMatnr()); matParam.setBatch(orderDetl.getBatch()); matParam.setOrderNo(orderDetl.getOrderNo()); matParam.setOrderId(orderDetl.getOrderId()); matParam.setCount(count); matParam.setUseCount(count); maps.add(matParam); } return R.ok().add(maps); } @RequestMapping("/outBound/order/list") @ManagerAuth(memo = "获取出库订单") public R outBound(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) { List docTypes = docTypeService.list(new LambdaQueryWrapper().like(DocType::getPakout, 1)); ArrayList typeList = new ArrayList<>(); for (DocType docType : docTypes) { typeList.add(docType.getDocId()); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Order::getStatus, 1); wrapper.eq(Order::getHostId, getHostId()); wrapper.in(Order::getDocType, typeList); List orders = orderService.list(wrapper); ArrayList orderIds = new ArrayList<>(); for (Order order : orders) { orderIds.add(order.getId()); } //搜索明细 LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(OrderDetl::getStatus, 1); wrapper1.eq(OrderDetl::getHostId, getHostId()); wrapper1.in(OrderDetl::getOrderId, orderIds); if (!Cools.isEmpty(matnr)) { wrapper1.like(OrderDetl::getMatnr, matnr); } List list = orderDetlService.list(wrapper1); ArrayList maps = new ArrayList<>(); for (OrderDetl orderDetl : list) { //剩余可用数量 double count = orderDetl.getAnfme() - orderDetl.getWorkQty(); if (count <= 0) { continue; } PickMatParam matParam = new PickMatParam(); matParam.setMatnr(orderDetl.getMatnr()); matParam.setBatch(orderDetl.getBatch()); matParam.setOrderNo(orderDetl.getOrderNo()); matParam.setOrderId(orderDetl.getOrderId()); matParam.setCount(count); matParam.setUseCount(count); maps.add(matParam); } return R.ok().add(maps); } @RequestMapping("/pick/in") @ManagerAuth(memo = "并板入库") @Transactional public R pickConfirm(@RequestBody PickConfirmParam param) { LocMast locMast = locMastService.getOne(new LambdaQueryWrapper() .eq(LocMast::getLocNo, param.getLocNo()) .eq(LocMast::getHostId, getHostId())); if (!locMast.getLocSts().equals("F")) { return R.error("库位状态不是在库"); } StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper() .eq(StaDesc::getTypeNo, 104) .eq(StaDesc::getStnNo, param.getStaNo()) .eq(StaDesc::getHostId, getHostId())); if (staDesc == null) { return R.error("站点不存在"); } //检验传参是否和订单明细匹配 for (PickMatParam matParam : param.getList()) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(OrderDetl::getOrderNo, matParam.getOrderNo()) .eq(OrderDetl::getHostId, getHostId()) .eq(OrderDetl::getStatus, 1) .eq(OrderDetl::getMatnr, matParam.getMatnr()); if (!Cools.isEmpty(matParam.getBatch())) { wrapper.eq(OrderDetl::getBatch, matParam.getBatch()); } OrderDetl orderDetl = orderDetlService.getOne(wrapper); if (orderDetl == null) { return R.error("物料数据不存在"); } //剩余可用数量 double count = orderDetl.getAnfme() - orderDetl.getWorkQty(); if (matParam.getCount() != count) { return R.error("物料数据已过期"); } if (matParam.getUseCount() > count) { return R.error("可用数量不足"); } } Date now = new Date(); // 生成工作号 int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(104)); // 生成工作档 WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(now); wrkMast.setWrkSts(101L); // 工作状态：101.生成出库 wrkMast.setIoType(104); // 入出库状态 wrkMast.setIoPri(13D); // 优先级：13 wrkMast.setSourceStaNo(staDesc.getDeviceStn()); // 源站 wrkMast.setStaNo(staDesc.getStnNo()); // 目标站 wrkMast.setSourceLocNo(param.getLocNo()); // 源库位 wrkMast.setFullPlt("Y"); // 满板：Y wrkMast.setPicking("Y"); // 拣料 wrkMast.setExitMk("N"); // 退出 wrkMast.setEmptyMk("N"); // 空板 wrkMast.setBarcode(locMast.getBarcode()); wrkMast.setAppeUser(String.valueOf(getUserId())); // 操作人员数据 wrkMast.setAppeTime(now); wrkMast.setModiUser(String.valueOf(getUserId())); wrkMast.setModiTime(now); wrkMast.setHostId(getHostId()); wrkMast.setCrnNo(staDesc.getDeviceNo()); if (!wrkMastService.save(wrkMast)) { throw new CoolException("保存工作档失败，出库库位号：" + param.getLocNo()); } // 生成工作档明细 for (PickMatParam matParam : param.getList()) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(Mat::getHostId, getHostId()); wrapper.eq(Mat::getStatus, 1); wrapper.eq(Mat::getMatnr, matParam.getMatnr()); Mat mat = matService.getOne(wrapper); if (mat == null) { throw new CoolException("保存工作档失败，物料信息不存在：" + matParam.getMatnr()); } WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(mat); wrkDetl.setOrderNo(matParam.getOrderNo()); wrkDetl.setWrkNo(workNo); wrkDetl.setIoTime(now); wrkDetl.setAnfme(matParam.getUseCount()); // 数量 wrkDetl.setAppeTime(now); wrkDetl.setAppeUser(getUserId()); wrkDetl.setModiTime(now); wrkDetl.setModiUser(getUserId()); wrkDetl.setHostId(getHostId()); wrkDetl.setWrkMastId(wrkMast.getId()); wrkDetl.setZpallet(wrkMast.getBarcode()); if (!wrkDetlService.save(wrkDetl)) { throw new CoolException("保存工作档明细失败"); } Order order = orderService.selectByNo(matParam.getOrderNo(), getHostId()); if (order == null) { throw new CoolException("Order is not exits"); } //更新订单工作数量 orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount(), getHostId()); orderService.updateSettle(order.getId(), 2L, getUserId(), getHostId()); } // 修改库位状态: F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中 locMast = locMastService.getOne(new LambdaQueryWrapper().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId, getHostId())); if (locMast.getLocSts().equals("F")) { locMast.setLocSts("P"); locMast.setModiUser(getUserId()); locMast.setModiTime(now); if (!locMastService.updateById(locMast)) { throw new CoolException("预约库位状态失败，库位号：" + param.getLocNo()); } } else { throw new CoolException(param.getLocNo() + "库位不是在库状态"); } return R.ok(); } @RequestMapping("/barcode/list/all") @ManagerAuth(memo = "并板入库途中拣料出库获取任务信息") @Transactional public R orderOutListOrder(@RequestBody String barcode) { ArrayList wrkMastArrayList = new ArrayList<>(); if (Cools.isEmpty(barcode) || barcode.isEmpty()) { List wrkMasts = wrkMastService.list(new LambdaQueryWrapper() .eq(WrkMast::getHostId, getHostId()) .eq(WrkMast::getWrkSts, 199L) .eq(WrkMast::getIoType, 104)); wrkMastArrayList.addAll(wrkMasts); List wrkMasts1 = wrkMastService.list(new LambdaQueryWrapper() .eq(WrkMast::getHostId, getHostId()) .eq(WrkMast::getWrkSts, 199L) .eq(WrkMast::getIoType, 107)); wrkMastArrayList.addAll(wrkMasts1); } else { List wrkMasts = wrkMastService.list(new LambdaQueryWrapper() .like(WrkMast::getBarcode, barcode) .eq(WrkMast::getHostId, getHostId()) .eq(WrkMast::getWrkSts, 199L) .eq(WrkMast::getIoType, 104)); wrkMastArrayList.addAll(wrkMasts); List wrkMasts1 = wrkMastService.list(new LambdaQueryWrapper() .like(WrkMast::getBarcode, barcode) .eq(WrkMast::getHostId, getHostId()) .eq(WrkMast::getWrkSts, 199L) .eq(WrkMast::getIoType, 107)); wrkMastArrayList.addAll(wrkMasts1); } return R.ok().add(wrkMastArrayList); } @RequestMapping("/barcode/list/pick") @ManagerAuth(memo = "拣料入库途中并板") @Transactional public R orderOutListOrderPick(@RequestBody String barcode) { ArrayList wrkMastArrayList = new ArrayList<>(); if (Cools.isEmpty(barcode) || barcode.isEmpty()) { List wrkMasts = wrkMastService.list(new LambdaQueryWrapper() .eq(WrkMast::getHostId, getHostId()) .eq(WrkMast::getWrkSts, 199L) .eq(WrkMast::getIoType, 103)); wrkMastArrayList.addAll(wrkMasts); List wrkMasts1 = wrkMastService.list(new LambdaQueryWrapper() .eq(WrkMast::getHostId, getHostId()) .eq(WrkMast::getWrkSts, 199L) .eq(WrkMast::getIoType, 107)); wrkMastArrayList.addAll(wrkMasts1); } else { List wrkMasts = wrkMastService.list(new LambdaQueryWrapper() .like(WrkMast::getBarcode, barcode) .eq(WrkMast::getHostId, getHostId()) .eq(WrkMast::getWrkSts, 199L) .eq(WrkMast::getIoType, 103) ); wrkMastArrayList.addAll(wrkMasts); List wrkMasts1 = wrkMastService.list(new LambdaQueryWrapper() .like(WrkMast::getBarcode, barcode) .eq(WrkMast::getHostId, getHostId()) .eq(WrkMast::getWrkSts, 199L) .eq(WrkMast::getIoType, 107)); wrkMastArrayList.addAll(wrkMasts1); } return R.ok().add(wrkMastArrayList); } @PostMapping("/pda/OutLocNo") @ManagerAuth(memo = "获得平库出库的对应库位号") @Transactional public R OutLocNo(@RequestParam Long orderId) { List orderDetls = orderDetlService.list(new LambdaQueryWrapper() .eq(OrderDetl::getOrderId, orderId) .eq(OrderDetl::getHostId, getHostId()) ); if (Cools.isEmpty(orderDetls)) { return R.error("订单明细不存在"); } List list = new ArrayList<>(); for (OrderDetl o : orderDetls ) { if (o.getAnfme() <= o.getWorkQty()) { continue; } else { //查看库位明细中有的物料 List locDetls = locDetlService.list(new LambdaQueryWrapper() .eq(LocDetl::getMatnr, o.getMatnr()).eq(LocDetl::getHostId, getHostId()) ); if (Cools.isEmpty(locDetls)) { continue; } else { for (LocDetl l : locDetls ) { String s = l.getLocNo().substring(1, 2); if (Integer.valueOf(s) > 4) { list.add(l.getLocNo()); } } } } } List myList = list.stream().distinct().collect(Collectors.toList()); return R.ok(myList); } @PostMapping("/pda/OrderDetlContrastLocDetl") @ManagerAuth(memo = "获得订单明细对应的库存明细") @Transactional public R OrderDetlContrastLocDetl(@RequestParam Long orderId, @RequestParam String locNo) { List locDetlList = new ArrayList(); List orderDetls = orderDetlService.list(new LambdaQueryWrapper() .eq(OrderDetl::getOrderId, orderId) .eq(OrderDetl::getHostId, getHostId()) ); if (Cools.isEmpty(orderDetls)) { return R.error("订单明细不存在"); } List locDetls = locDetlService.list(new LambdaQueryWrapper() .eq(LocDetl::getLocNo, locNo)); if (Cools.isEmpty(locDetls)) { return R.error("库位为空"); } for (OrderDetl o : orderDetls ) { for (LocDetl l : locDetls ) { if (o.getMatnr().equals(l.getMatnr())) { if (o.getAnfme() - o.getWorkQty() >= l.getAnfme()) { } else { l.setAnfme(o.getAnfme() - o.getWorkQty()); } locDetlList.add(l); break; } } } return R.ok(locDetlList); } }