package com.zy.asrs.service.impl;
|
|
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.asrs.utils.MatCompareUtils;
|
import com.zy.common.model.DetlDto;
|
import com.zy.common.model.LocDto;
|
import com.zy.common.service.CommonService;
|
import lombok.extern.slf4j.Slf4j;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.stereotype.Service;
|
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
import java.util.*;
|
|
/**
|
* 移动端服务核心类
|
* 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 AdjDetlService adjDetlService;
|
|
|
@Override
|
@Transactional
|
public void comb(CombParam param, Long userId) {
|
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
|
throw new CoolException(BaseRes.PARAM);
|
}
|
// if(param.getCombMats().size()>1){
|
// throw new CoolException("请提取一个商品，或者刷新重新组托！");
|
// }
|
// 判断是否有相同条码的数据
|
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
|
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
|
throw new CoolException(param.getBarcode() + "数据正在进行入库");
|
}
|
|
if (param.getBarcode().length() != 8) {
|
throw new CoolException("条码长度不是8位===>>" + param.getBarcode());
|
}
|
// if (param.getCombMats().size()>1){
|
// throw new CoolException("不允许混料===>>" + param.getBarcode());
|
// }
|
|
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
|
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
|
int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
|
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
|
throw new CoolException("组托档/工作档/库存条码数据已存在===>>" + param.getBarcode());
|
}
|
|
Date now = new Date();
|
|
// 无单组托
|
// if (Cools.isEmpty(param.getOrderNo())) {
|
//
|
// // 生成入库通知档
|
// List<DetlDto> 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());
|
// if (Cools.isEmpty(mat)) {
|
// throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
|
// }
|
// WaitPakin waitPakin = new WaitPakin();
|
// 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 {
|
|
Order order = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", param.getOrderNo()));
|
if (Cools.isEmpty(order) || order.getSettle() > 2) {
|
throw new CoolException("单据编号已过期");
|
}
|
// 生成入库通知档
|
List<DetlDto> detlDtos = new ArrayList<>();
|
param.getCombMats().forEach(elem -> {
|
|
// 订单明细数量校验
|
//OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch(),elem.getAnfme() );
|
OrderDetl orderDetl = orderDetlService.selectById(elem.getDetlId());
|
if (elem.getAnfme() > orderDetl.getEnableQty()) {
|
throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
|
}
|
// 修改订单作业数量
|
if (!orderDetlService.increaseWorkQty(orderDetl, elem.getAnfme())) {
|
throw new CoolException("修改单据作业数量失败");
|
}
|
|
Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
|
if (Cools.isEmpty(mat)) {
|
throw new CoolException(orderDetl.getMatnr() + "商品档案不存在");
|
}
|
WaitPakin waitPakin = new WaitPakin();
|
waitPakin.sync(mat);
|
waitPakin.setOrderNo(order.getOrderNo()); // 单据编号
|
waitPakin.setBatch(orderDetl.getBatch()); // 序列码
|
waitPakin.setZpallet(param.getBarcode()); // 托盘码
|
waitPakin.setIoStatus("N"); // 入出状态
|
waitPakin.setAnfme(elem.getAnfme()); // 数量
|
waitPakin.setStatus("Y"); // 状态
|
waitPakin.setAppeUser(userId);
|
waitPakin.setAppeTime(now);
|
waitPakin.setModiUser(userId);
|
waitPakin.setModiTime(now);
|
|
waitPakin.setBatch(orderDetl.getBatch());
|
waitPakin.setSPgNO(orderDetl.getSPgNO());
|
waitPakin.setOutOrderNo(orderDetl.getOutOrderNo());
|
waitPakin.setProType(orderDetl.getProType());
|
waitPakin.setLuHao(orderDetl.getLuHao());
|
waitPakin.setPacking(orderDetl.getPacking());
|
if (!waitPakinService.insert(waitPakin)) {
|
throw new CoolException("保存入库通知档失败");
|
}
|
});
|
|
orderService.updateSettle(order.getId(), 2L, userId);
|
// }
|
|
}
|
|
// 商品上架
|
@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<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
|
|
List<WrkDetl> list = param.getWrkDetls();
|
|
// 修改数量
|
Iterator<WrkDetl> iterator = wrkDetls.iterator();
|
while (iterator.hasNext()) {
|
WrkDetl wrkDetl = iterator.next();
|
Iterator<WrkDetl> 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<WaitPakin>().
|
// 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<DetlDto> 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(),detlDto.getAnfme());
|
//
|
// if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
|
// throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
|
// }
|
// // 修改订单作业数量
|
// if (!orderDetlService.increaseWorkQty(orderDetl, 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);
|
//根据订单号生成出库任务工作档
|
List<OrderDetl> pg_no = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_no", orderNo));
|
Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", pg_no.get(0).getOrderNo()));
|
if (order.getSettle() != 1 && order.getSettle() != 2) {
|
throw new CoolException("该订单已处理");
|
}
|
|
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
|
Date now = new Date();
|
for (OrderDetl orderDetl : orderDetls) {
|
//查询所有库位状态为F的库位信息
|
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl);
|
if (locDetls.size() == 0) {
|
throw new CoolException("库存中没有该物料");
|
}
|
for (LocDetl locDetl : locDetls) {
|
//如果该库位出库路线所用的堆垛机out_enable不为Y,跳过该循环
|
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
|
.eq("loc_no", locDetl.getLocNo()));
|
if (Cools.isEmpty(locMast)) {
|
continue;
|
}
|
BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
|
.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<Order>().eq("order_no", orderNo))) {
|
throw new CoolException("更新订单状态失败");
|
}
|
orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
|
orderDetl.setUpdateBy(userId);
|
orderDetl.setUpdateTime(now);
|
Wrapper wrapper = new EntityWrapper<OrderDetl>().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<StaDesc> wrapper = new EntityWrapper<StaDesc>()
|
.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() + "库位不是在库状态");
|
}
|
}
|
|
/**
|
* 拣料途中并板直接加到库存中
|
* @param param
|
* @param userId
|
* @return
|
*/
|
@Override
|
@Transactional
|
public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long userId) {
|
//判断库位状态
|
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
|
if (Cools.isEmpty(locMast)){
|
return R.error("该库位不存在");
|
}
|
if (!locMast.getLocSts().equals("P")){
|
return R.error("该库位状态为："+locMast.getLocSts()+",不满足拣料途中并板条件！！！");
|
}
|
|
HashMap<String, OrderDetl> mapData = new HashMap<>();
|
for (OrderDetl orderDetl : param.getCombMats()) {
|
String key = orderDetl.getMatnr();
|
// private static final String[] sameFields = {"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType","color"};
|
if (!Cools.isEmpty(orderDetl.getBatch())) {
|
key += "_" + orderDetl.getBatch();
|
}
|
if (!Cools.isEmpty(orderDetl.getOutOrderNo())) {
|
key += "_" + orderDetl.getOutOrderNo();
|
}
|
if (!Cools.isEmpty(orderDetl.getLuHao())) {
|
key += "_" + orderDetl.getLuHao();
|
}
|
if (!Cools.isEmpty(orderDetl.getPacking())) {
|
key += "_" + orderDetl.getPacking();
|
}
|
if (!Cools.isEmpty(orderDetl.getSPgNO())) {
|
key += "_" + orderDetl.getSPgNO();
|
}
|
if (!Cools.isEmpty(orderDetl.getProType())) {
|
key += "_" + orderDetl.getProType();
|
}
|
if (!Cools.isEmpty(orderDetl.getColor())) {
|
key += "_" + orderDetl.getColor();
|
}
|
|
OrderDetl value = mapData.get(key);
|
if(value == null){
|
mapData.put(key, orderDetl);
|
}else {
|
value.setAnfme(value.getAnfme() + orderDetl.getAnfme());
|
mapData.put(key, value);
|
}
|
}
|
|
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
|
|
HashMap<String, PickMergeDto> locData = new HashMap<>();
|
for (LocDetl locDetl : locDetls) {
|
String matKey = locDetl.getMatnr();
|
if (!Cools.isEmpty(locDetl.getBatch())) {
|
matKey += "_" + locDetl.getBatch();
|
}
|
if (!Cools.isEmpty(locDetl.getOutOrderNo())) {
|
matKey += "_" + locDetl.getOutOrderNo();
|
}
|
if (!Cools.isEmpty(locDetl.getLuHao())) {
|
matKey += "_" + locDetl.getLuHao();
|
}
|
if (!Cools.isEmpty(locDetl.getPacking())) {
|
matKey += "_" + locDetl.getPacking();
|
}
|
if (!Cools.isEmpty(locDetl.getSPgNO())) {
|
matKey += "_" + locDetl.getSPgNO();
|
}
|
if (!Cools.isEmpty(locDetl.getProType())) {
|
matKey += "_" + locDetl.getProType();
|
}
|
if (!Cools.isEmpty(locDetl.getColor())) {
|
matKey += "_" + locDetl.getColor();
|
}
|
|
PickMergeDto dto = new PickMergeDto();
|
dto.setOriginAnfme(locDetl.getAnfme());
|
dto.setLocDetl(locDetl);
|
dto.setOrders(new ArrayList<>());
|
locData.put(matKey, dto);
|
}
|
|
for (Map.Entry<String, OrderDetl> entry : mapData.entrySet()) {
|
OrderDetl orderDetl = entry.getValue();
|
LocDetl locDetl = new LocDetl();
|
locDetl.sync(orderDetl);
|
locDetl.setLocNo(param.getLocNo());
|
locDetl.setBarcode(locMast.getBarcode());
|
Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr",locDetl.getMatnr()));
|
locDetl.setMaktx(mat.getMaktx());
|
|
String matKey = locDetl.getMatnr();
|
if (!Cools.isEmpty(locDetl.getBatch())) {
|
matKey += "_" + locDetl.getBatch();
|
}
|
if (!Cools.isEmpty(locDetl.getOutOrderNo())) {
|
matKey += "_" + locDetl.getOutOrderNo();
|
}
|
if (!Cools.isEmpty(locDetl.getLuHao())) {
|
matKey += "_" + locDetl.getLuHao();
|
}
|
if (!Cools.isEmpty(locDetl.getPacking())) {
|
matKey += "_" + locDetl.getPacking();
|
}
|
if (!Cools.isEmpty(locDetl.getSPgNO())) {
|
matKey += "_" + locDetl.getSPgNO();
|
}
|
if (!Cools.isEmpty(locDetl.getProType())) {
|
matKey += "_" + locDetl.getProType();
|
}
|
if (!Cools.isEmpty(locDetl.getColor())) {
|
matKey += "_" + locDetl.getColor();
|
}
|
|
|
PickMergeDto dto = locData.get(matKey);
|
if (dto == null) {
|
ArrayList<PickMergeOrderDto> orders = new ArrayList<>();
|
orders.add(new PickMergeOrderDto(locDetl.getOrderNo(), locDetl.getAnfme()));
|
|
dto = new PickMergeDto();
|
dto.setOriginAnfme(0.0);
|
dto.setLocDetl(locDetl);
|
dto.setOrders(orders);
|
|
locData.put(matKey, dto);
|
}else {
|
LocDetl detl = dto.getLocDetl();
|
List<PickMergeOrderDto> orders = dto.getOrders();
|
|
detl.setAnfme(detl.getAnfme() + locDetl.getAnfme());
|
orders.add(new PickMergeOrderDto(locDetl.getOrderNo(), locDetl.getAnfme()));
|
|
dto.setLocDetl(detl);
|
dto.setOrders(orders);
|
|
locData.put(matKey, dto);
|
}
|
}
|
|
|
for (Map.Entry<String, PickMergeDto> entry : locData.entrySet()) {
|
PickMergeDto dto = entry.getValue();
|
|
Double originAnfme = dto.getOriginAnfme();
|
LocDetl locDetl = dto.getLocDetl();
|
List<PickMergeOrderDto> orders = dto.getOrders();
|
|
Boolean b=false;
|
for (LocDetl detl : locDetls) {
|
b= MatCompareUtils.compare(detl, locDetl);
|
if (b) break;
|
}
|
|
if (b){
|
if (!locDetlService.updateAnfmeAdd(locDetl.getAnfme(),locDetl.getLocNo(),locDetl)) {
|
throw new CoolException("并板库存更新失败");
|
}
|
}else {
|
locDetl.setZpallet(locDetl.getBarcode());
|
if (!locDetlService.insert(locDetl)) {
|
throw new CoolException("并板库存插入失败");
|
}
|
}
|
|
if (!orders.isEmpty()){
|
for (PickMergeOrderDto orderDto : orders) {
|
Order order = orderService.selectByNo(orderDto.getOrderNo());
|
if (Cools.isEmpty(order)){
|
continue;
|
}
|
if (order.getSettle() == 1){
|
orderService.updateSettle(order.getId(), 2L, 9527L);
|
}
|
|
|
LocDto locDto = new LocDto(locDetl.getOrderNo(),locDetl.getMatnr(),locDetl.getBatch(),locDetl.getOutOrderNo(),locDetl.getLuHao(),locDetl.getPacking(),locDetl.getSPgNO(),locDetl.getProType(),locDetl.getColor());
|
OrderDetl orderDetl = orderDetlService.selectItem(locDto);
|
if (Cools.isEmpty(orderDetl)){
|
continue;
|
}
|
if (orderDetl.getAnfme() < (orderDetl.getWorkQty() + orderDto.getAnfme())) {
|
throw new CoolException("并板数量出错,订单剩余出库数量小于已出库数量与将并板数量之和！！！");
|
}
|
// 修改订单明细作业数量
|
if (!orderDetlService.increaseWorkQtyByOrderNo(orderDto.getOrderNo(), orderDetl, orderDto.getAnfme())) {
|
throw new CoolException("修改单据明细工作数量失败");
|
}
|
// 修改订单明细完成数量
|
if (!orderDetlService.increaseQtyByOrderNo1(orderDto.getOrderNo(), orderDetl, orderDto.getAnfme())) {
|
throw new CoolException("修改单据明细完成数量失败");
|
}
|
// 修改订单状态 作业中 ===>> 已完成
|
orderService.checkComplete(orderDto.getOrderNo());
|
|
try {
|
//处理库存信息
|
AdjDetl adjDetl = new AdjDetl();
|
adjDetl.setLocNo(locDetl.getLocNo());
|
adjDetl.setMatnr(locDetl.getMatnr());
|
adjDetl.setBatch(locDetl.getBatch());
|
adjDetl.setOriQty(originAnfme);
|
adjDetl.setAdjQty(locDetl.getAnfme());
|
adjDetl.setMemo("拣料途中并板");
|
adjDetl.setModiUser(userId);
|
adjDetl.setAppeUser(userId);
|
adjDetl.setAppeTime(new Date());
|
adjDetl.setModiTime(new Date());
|
adjDetl.setExpand(locDetl);//对扩充进行拼接
|
adjDetl.setOrderNo(order.getOrderNo());
|
|
if (!adjDetlService.save(adjDetl,userId)) {
|
throw new CoolException("保存库存调整记录失败");
|
}
|
}catch (Exception e){
|
e.printStackTrace();
|
throw new CoolException("更新库存数据出错" + e.getMessage());
|
}
|
}
|
}
|
|
|
}
|
return R.ok();
|
}
|
}
|
