package com.zy.asrs.controller;
|
|
import com.alibaba.fastjson.JSONObject;
|
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
import com.core.annotations.ManagerAuth;
|
import com.core.common.BaseRes;
|
import com.core.common.Cools;
|
import com.core.common.R;
|
import com.core.exception.CoolException;
|
import com.zy.asrs.entity.*;
|
import com.zy.asrs.entity.param.*;
|
import com.zy.asrs.entity.result.MobileAdjustResult;
|
import com.zy.asrs.mapper.ManLocDetlMapper;
|
import com.zy.asrs.service.*;
|
import com.zy.common.model.WrkDto;
|
import com.zy.common.web.BaseController;
|
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.Logger;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.web.bind.annotation.*;
|
|
import java.math.BigDecimal;
|
import java.util.*;
|
|
/**
|
* 移动端接口控制器
|
* Created by vincent on 2020/6/10
|
*/
|
@RestController
|
@RequestMapping("mobile")
|
public class MobileController extends BaseController {
|
|
@Autowired
|
private MobileService mobileService;
|
@Autowired
|
private LocMastService locMastService;
|
@Autowired
|
private LocDetlService locDetlService;
|
@Autowired
|
private OrderService orderService;
|
@Autowired
|
private OrderDetlService orderDetlService;
|
@Autowired
|
private DocTypeService docTypeService;
|
@Autowired
|
private WrkMastService wrkMastService;
|
@Autowired
|
private WrkDetlService wrkDetlService;
|
@Autowired
|
private BasDevpService basDevpService;
|
@Autowired
|
private PackService packService;
|
@Autowired
|
private ManLocDetlMapper manLocDetlMapper;
|
@Autowired
|
private WrkDetlLogService wrkDetlLogService;
|
|
|
private static Logger logger = LogManager.getLogger(MobileController.class);
|
|
// 商品上架
|
@RequestMapping("/mat/onSale/auth")
|
@ManagerAuth
|
public R matOnSale(@RequestBody CombParam combParam) {
|
mobileService.onSale(combParam);
|
return R.ok("上架成功");
|
}
|
|
// 商品下架
|
@RequestMapping("/mat/offSale/auth")
|
//@ManagerAuth
|
public R matOffSale(@RequestBody OffSaleParam offSaleParam) {
|
mobileService.offSale(offSaleParam);
|
return R.ok("下架成功");
|
}
|
|
|
// 组托 ----------------------------------------------------------------------------------------------------
|
|
/**
|
* 根据单号检索单据数据
|
* http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
|
*/
|
// @RequestMapping("/order/search/orderNo/auth")
|
// @ManagerAuth
|
// public R orderSearchByBarcode(@RequestParam String orderNo){
|
// Order order = orderService.selectByNo(orderNo);
|
// if (order == null) {
|
// return R.ok();
|
// }
|
// DocType docType = docTypeService.selectById(order.getDocType());
|
// if (docType.getPakin() == null || docType.getPakin() != 1) {
|
// return R.ok();
|
// }
|
// if (order.getSettle() > 2) {
|
// return R.ok();
|
// }
|
// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
|
// if (Cools.isEmpty(orderDetls)) {
|
// return R.ok();
|
// }
|
// return R.ok().add(orderDetls);
|
// }
|
@RequestMapping("/order/search/orderNo/auth")
|
@ManagerAuth
|
public R orderSearchByBarcode(@RequestParam String orderNo) {
|
if (Cools.isEmpty(orderNo)) {
|
orderNo = null;
|
}
|
List<Order> orders = orderService.selectorderNoL(orderNo);
|
if (Cools.isEmpty(orders)) {
|
return R.ok();
|
}
|
LinkedList<CombParam> combParams = new LinkedList<>();
|
if (!Cools.isEmpty(orders)) {
|
for (Order order : orders) {
|
CombParam combParam = new CombParam();
|
if (order == null) {
|
continue;
|
}
|
DocType docType = docTypeService.selectById(order.getDocType());
|
if (docType.getPakin() == null || docType.getPakin() != 1) {
|
continue;
|
}
|
if (order.getSettle() > 2) {
|
continue;
|
}
|
List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
|
if (!Cools.isEmpty(orderDetls)) {
|
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
|
for (OrderDetl orderDetl : orderDetls) {
|
CombParam.CombMat combMat = new CombParam.CombMat();
|
combMat.setMatnr(orderDetl.getMatnr());
|
combMat.setBatch(orderDetl.getBatch());
|
combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
|
combMat.setMaktx(orderDetl.getMaktx());
|
combMat.setSpecs(orderDetl.getSpecs());
|
combMats.add(combMat);
|
}
|
combParam.setCombMats(combMats);
|
}
|
combParam.setOrderNo(order.getOrderNo());
|
combParams.add(combParam);
|
}
|
}
|
return R.ok().add(combParams);
|
}
|
|
@RequestMapping("/comb/auth")
|
@ManagerAuth(memo = "组托")
|
public R comb(@RequestBody CombParam combParam) {
|
logger.info("组托参数：{}", combParam);
|
if (Cools.isEmpty(combParam.getOrderNo())) {
|
combParam.setOrderNo(combParam.getBillNo());
|
}
|
List<CombParam.CombMat> combMats = combParam.getCombMats();
|
combMats.forEach(elem -> {
|
if (Cools.isEmpty(elem.getBatch())) {
|
elem.setBatch(elem.getItemBatch());
|
}
|
});
|
mobileService.comb(combParam, getUserId());
|
return R.ok("组托成功");
|
}
|
|
@RequestMapping("/pack/get/auth")
|
@ManagerAuth
|
public R packGet(@RequestParam String barcode) {
|
Pack pack = packService.selectByBarcode(barcode);
|
if (pack == null) {
|
return R.ok();
|
}
|
if (pack.getSettle() == 1L) {
|
return R.ok().add(pack);
|
}
|
return R.ok("组托成功");
|
}
|
|
// @RequestMapping("/pack/comb/auth")
|
// @ManagerAuth(memo = "下线组托")
|
// public R packComb(@RequestBody CombParam combParam) {
|
// mobileService.packComb(combParam, getUserId());
|
// return R.ok("组托成功");
|
// }
|
|
|
// 出库 ---------------------------------------------------------------------------------------------------
|
|
@RequestMapping("/pakout/query/auth")
|
@ManagerAuth
|
@Deprecated
|
public R pakoutQuery(@RequestParam String barcode) {
|
if (Cools.isEmpty(barcode)) {
|
return R.ok();
|
}
|
if (!Cools.isEmpty(barcode)) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode));
|
return R.ok().add(wrkDetls);
|
}
|
// if (!Cools.isEmpty(matnr)) {
|
// if (!Cools.isEmpty(staNo)) {
|
// List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
|
// 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();
|
}
|
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
|
if (wrkMast != null) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
|
// 去除已出库确认的明细
|
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();
|
}
|
|
/**
|
* 出库确认 - 扫货物 广德宜科版
|
* 1.全板 返回 101
|
* 2.拣料 返回 103
|
*/
|
@RequestMapping("/pakout/confirm/goods/auth") //待完善 原因（客户未给出详细信息）
|
@ManagerAuth
|
public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam) {
|
if (Cools.isEmpty(combParam)) {
|
return R.ok();
|
}
|
// List<Order> orders = orderService.selectorderNoL(batch);
|
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
|
if (Cools.isEmpty(orderDetl)) {
|
return R.error("未查到数据");
|
}
|
if (!orderDetl.getQty$().equals("已完成")) {
|
return R.error("任务未完成");
|
}
|
//复核数
|
orderDetl.setSource(1);
|
orderDetlService.updateById(orderDetl);
|
return R.ok();
|
}
|
|
// 根据库位码和商品码搜索商品
|
@RequestMapping("/mat/find/auth")
|
public R find(@RequestParam(required = false) String locNo
|
, @RequestParam(required = false) String matnr) {
|
//List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
|
ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
|
return R.ok(manLocDetl);
|
//return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
|
}
|
|
/**
|
* 出库确认 - 拣料出库 - 选择具体条码商品
|
*/
|
@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();
|
}
|
WrkMast wrkMast = wrkMastService.selectById(wrkNo);
|
if (wrkMast == null) {
|
return R.ok();
|
}
|
String orderNo = null;
|
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
|
for (WrkDetl wrkDetl : wrkDetls) {
|
if (Cools.isEmpty(orderNo)) {
|
orderNo = wrkDetl.getOrderNo();
|
}
|
if ((wrkDetl.getMatnr() + "-" + wrkDetl.getBatch()).equals(matnr)) {
|
return R.ok().add(wrkDetl);
|
}
|
}
|
// 替换 明细
|
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
|
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<WrkDetl> list) {
|
if (Cools.isEmpty(list)) {
|
return R.ok();
|
}
|
Set<Integer> wrkNos = new HashSet<>();
|
List<WrkDto> 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.selectById(dto.getWrkNo());
|
if (wrkMast != null) {
|
// 101
|
if (wrkMast.getIoType() == 101) {
|
for (WrkDetl wrkDetl : dto.getWrkDetls()) {
|
wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
|
}
|
}
|
// 103
|
if (wrkMast.getIoType() == 103) {
|
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
|
throw new CoolException("拣料出库确认失败");
|
}
|
for (WrkDetl wrkDetl : dto.getWrkDetls()) {
|
wrkDetl.setInspect(1);
|
if (!wrkDetlService.insert(wrkDetl)) {
|
throw new CoolException("拣料出库确认失败");
|
}
|
}
|
}
|
}
|
}
|
|
for (Integer wrkNo : wrkNos) {
|
WrkMast wrkMast = wrkMastService.selectById(wrkNo);
|
if (wrkMast.getWrkSts() == 14 && (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N"))) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
|
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();
|
}
|
BasDevp basDevp = basDevpService.selectById(staNo);
|
if (null != basDevp && basDevp.getWrkNo() != null) {
|
WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
|
if (wrkMast != null && wrkMast.getIoType() == 107) {
|
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
|
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());
|
return R.ok("盘点成功");
|
}
|
|
@PostMapping("/order/out/pakout/auth")
|
@ManagerAuth(memo = "订单出库")
|
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
|
if (!param.containsKey("staNo") || !param.containsKey("orderNo")) {
|
return R.parse(BaseRes.PARAM);
|
}
|
mobileService.pakoutByOrder(param, getUserId());
|
return R.ok("出库成功");
|
}
|
|
|
/**
|
* 根据通知单查询明细
|
*/
|
@RequestMapping("/bill/query1/auth")
|
@ManagerAuth(memo = "根据通知单查询明细")
|
public R billQuery1(@RequestParam String billNo, @RequestParam String size) {
|
Order temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", billNo));
|
if (temp1 == null) {
|
temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", billNo));
|
if (temp1 == null) {
|
throw new CoolException("该订单不存在");
|
}
|
}
|
List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).last("and anfme > work_qty"));
|
if (waitMatins == null || waitMatins.isEmpty()) {
|
throw new CoolException("该订单项不存在");
|
}
|
//如果通知单单号为空，则查询调拨单号
|
// if (Cools.isEmpty(waitMatins) || waitMatins.size() <= 0) {
|
// waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and anfme > work_qty"));
|
// }
|
|
List<CombBillQueryVo> vos = new ArrayList<>();
|
if (!Cools.isEmpty(waitMatins)) {
|
for (OrderDetl waitMatin : waitMatins) {
|
CombBillQueryVo vo = new CombBillQueryVo();
|
vo.setDetlId(waitMatin.getId());
|
vo.setMatnr(waitMatin.getMatnr());
|
vo.setMatName(waitMatin.getMaktx());
|
vo.setQty(waitMatin.getAnfme() - waitMatin.getWorkQty());
|
vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());
|
vo.setBillNo(waitMatin.getOrderNo());
|
vo.setSeqNo(waitMatin.getINo());
|
vo.setUnit(waitMatin.getUnit());
|
vo.setSpecs(waitMatin.getSpecs());
|
vo.setSize(waitMatin.getModel());
|
vo.setColor(waitMatin.getColor());
|
vo.setItemBatch(waitMatin.getBatch());
|
vo.setLuHao(waitMatin.getLuHao());
|
vo.setOutOrderNo(waitMatin.getOutOrderNo());
|
vo.setSPgNO(waitMatin.getSPgNO());
|
vo.setProType(waitMatin.getProType());
|
vo.setPacking(waitMatin.getPacking());
|
//vo.setOveFlag(waitMatin.getOveFlag());
|
vos.add(vo);
|
}
|
}
|
return R.ok().add(vos);
|
}
|
|
//------------------------------------------------------------------------------------------------------------------------------------------------并板功能新增---------------------------------------------------------------------------------------------
|
|
/**
|
* 新增拣料途中并板功能
|
*/
|
@RequestMapping("/barcode/list/pick")
|
@ManagerAuth(memo = "拣料入库途中并板")
|
@Transactional
|
public R orderOutListOrderPick(@RequestBody String barcode) {
|
ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
|
if (Cools.isEmpty(barcode) || barcode.isEmpty()) {
|
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.eq("wrk_sts", 14L)
|
.eq("io_type", 103));
|
wrkMastArrayList.addAll(wrkMasts);
|
} else {
|
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.like("barcode", barcode)
|
.eq("wrk_sts", 14L)
|
.eq("io_type", 103));
|
wrkMastArrayList.addAll(wrkMasts);
|
}
|
|
return R.ok().add(wrkMastArrayList);
|
}
|
|
@RequestMapping("/pick/mat/list")
|
@ManagerAuth(memo = "获取并板物料")
|
public R pickMats(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) {
|
List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
|
ArrayList<Long> typeList = new ArrayList<>();
|
for (DocType docType : docTypes) {
|
typeList.add(docType.getDocId());
|
}
|
|
EntityWrapper<Order> wrapper = new EntityWrapper<>();
|
wrapper.eq("status", 1);
|
wrapper.in("doc_type", typeList);
|
List<Order> orders = orderService.selectList(wrapper);
|
|
ArrayList<Long> orderIds = new ArrayList<>();
|
for (Order order : orders) {
|
orderIds.add(order.getId());
|
}
|
|
//搜索明细
|
EntityWrapper<OrderDetl> wrapper1 = new EntityWrapper<>();
|
wrapper1.eq("status", 1);
|
wrapper1.in("order_id", orderIds);
|
wrapper1.orderBy("create_time", false);
|
if (!Cools.isEmpty(matnr)) {
|
wrapper1.like("matnr", matnr);
|
}
|
if (!Cools.isEmpty(orderNo)) {
|
wrapper1.like("order_no", orderNo);
|
}
|
List<OrderDetl> list = orderDetlService.selectList(wrapper1);
|
|
ArrayList<PickMatParam> 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.setMaktx(orderDetl.getMaktx());
|
matParam.setBatch(orderDetl.getBatch());
|
matParam.setOrderNo(orderDetl.getOrderNo());
|
matParam.setOrderId(orderDetl.getOrderId());
|
matParam.setCount(count);
|
matParam.setUseCount(count);
|
////"outOrderNo", "luHao", "packing", "sPgNO", "proType","color"};
|
matParam.setOutOrderNo(orderDetl.getOutOrderNo());
|
matParam.setLuHao(orderDetl.getLuHao());
|
matParam.setPacking(orderDetl.getPacking());
|
matParam.setProType(orderDetl.getProType());
|
matParam.setSPgNO(orderDetl.getSPgNO());
|
matParam.setColor(orderDetl.getColor());
|
maps.add(matParam);
|
}
|
return R.ok().add(maps);
|
}
|
|
@RequestMapping(value = "/order/list/orderNo")
|
public R orderListorderNo(@RequestParam String orderNo) {
|
//数量修改成为完成数量
|
List<OrderDetl> orderDetl1 = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("orderNo", orderNo));
|
List<OrderDetl> orderDetls = new ArrayList<OrderDetl>();
|
for (OrderDetl o : orderDetl1) {
|
BigDecimal c1 = new BigDecimal(o.getEnableQty()).setScale(2, BigDecimal.ROUND_HALF_UP);
|
o.setAnfme(c1.doubleValue());
|
if (o.getAnfme().equals(0.0)) {
|
continue;
|
}
|
orderDetls.add(o);
|
}
|
return R.ok(orderDetls);
|
}
|
|
@RequestMapping(value = "/order/list/all")
|
@ManagerAuth
|
public R orderList() {
|
return R.ok(orderService.selectAllorderNo());
|
}
|
|
@RequestMapping(value = "/orderDetl/forOrderNo/mergePakin/v1")
|
@ManagerAuth
|
public R forOrderNoMergePakinV1(@RequestParam String orderNo) {
|
List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
|
ArrayList<Long> docTypeIds = new ArrayList<>();
|
for (DocType docType : docTypes) {
|
docTypeIds.add(docType.getDocId());
|
}
|
|
if (docTypeIds.isEmpty()) {
|
return R.error("单据类型不存在");
|
}
|
|
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().in("doc_type", docTypeIds).in("settle", 0, 1, 2));
|
if (orders.isEmpty()) {
|
return R.error("未查询到订单");
|
}
|
|
ArrayList<Long> orderIds = new ArrayList<>();
|
for (Order order : orders) {
|
orderIds.add(order.getId());
|
}
|
|
List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
|
.in("order_id", orderIds)
|
.like("order_no", orderNo)
|
);
|
if (Cools.isEmpty(orderDetlList)) {
|
return R.error("未查询到此订单此物料数据");
|
}
|
|
ArrayList<OrderDetl> orderDetls = new ArrayList<>();
|
for (OrderDetl orderDetl : orderDetlList) {
|
double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
|
if (count <= 0D) {
|
continue;
|
}
|
orderDetl.setAnfme(count);
|
orderDetls.add(orderDetl);
|
}
|
return R.ok(orderDetls);
|
}
|
|
/**
|
* 拣料途中并板
|
*
|
* @param param
|
* @return
|
*/
|
@RequestMapping("/pda/WarehouseOutPickMerge/v1")
|
@ManagerAuth
|
public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
|
return mobileService.WarehouseOutPickMergeV1(param, getUserId());
|
}
|
|
}
|
