package com.zy.asrs.service.impl;
|
|
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSONObject;
|
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
import com.baomidou.mybatisplus.mapper.Wrapper;
|
import com.core.common.*;
|
import com.core.exception.CoolException;
|
import com.zy.asrs.entity.*;
|
import com.zy.asrs.entity.param.*;
|
import com.zy.asrs.mapper.LocMastMapper;
|
import com.zy.asrs.mapper.ManLocDetlMapper;
|
import com.zy.asrs.service.*;
|
import com.zy.asrs.utils.MatUtils;
|
import com.zy.asrs.utils.OrderInAndOutUtil;
|
import com.zy.asrs.utils.Utils;
|
import com.zy.common.constant.MesConstant;
|
import com.zy.common.entity.Parameter;
|
import com.zy.common.model.DetlDto;
|
import com.zy.common.model.LocDto;
|
import com.zy.common.model.MesCombParam;
|
import com.zy.common.model.enums.WorkNoType;
|
import com.zy.common.service.CommonService;
|
import com.zy.common.utils.HttpHandler;
|
import lombok.extern.slf4j.Slf4j;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.stereotype.Service;
|
import org.springframework.transaction.annotation.Transactional;
|
|
import javax.annotation.Resource;
|
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;
|
|
@Resource
|
private LocMastMapper locMastMapper;
|
|
@Resource
|
private DocTypeService docTypeService;
|
|
@Resource
|
private OrderDetlPakinService orderDetlPakinService;
|
|
@Resource
|
private OrderPakinService orderPakinService;
|
|
@Resource
|
private OrderPakoutService orderPakoutService;
|
|
@Resource
|
private OrderDetlPakoutService orderDetlPakoutService;
|
|
@Override
|
@Transactional
|
public R WarehouseOutPickMergeV1(WarehouseOutPickMergeParam param, Long hostId, 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()+",不满足拣料途中并板条件！！！");
|
}
|
|
Date now = new Date();
|
// 创建入库工作主档
|
WrkMast wrkMast = new WrkMast();
|
wrkMast.setWrkNo(commonService.getWorkNo(0));
|
wrkMast.setIoTime(now);
|
wrkMast.setWrkSts(4L); // 工作状态：入库完成
|
wrkMast.setIoType(8); // 入出库状态：8.拣料途中并板
|
wrkMast.setIoPri(13D); // 优先级
|
wrkMast.setCrnNo(1);
|
wrkMast.setSourceStaNo(1);
|
wrkMast.setStaNo(1);
|
wrkMast.setLocNo(param.getLocNo());
|
wrkMast.setBarcode(param.getBarcode()); // 托盘码
|
wrkMast.setFullPlt("Y"); // 满板：Y
|
wrkMast.setPicking("N"); // 拣料
|
wrkMast.setExitMk("N"); // 退出
|
wrkMast.setEmptyMk("N"); // 空板
|
wrkMast.setLinkMis("Y");
|
wrkMast.setCtnType(0); // 容器类型
|
// 操作人员数据
|
wrkMast.setAppeTime(now);
|
wrkMast.setModiTime(now);
|
wrkMast.setAppeUser(userId);
|
wrkMast.setModiUser(userId);
|
wrkMastService.insert(wrkMast);
|
|
for (OrderDetl orderDetl : param.getCombMats()) {
|
Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr",orderDetl.getMatnr()));
|
if (mat == null) {
|
throw new CoolException("保存工作档失败，物料信息不存在：" + orderDetl.getMatnr());
|
}
|
WrkDetl wrkDetl = new WrkDetl();
|
wrkDetl.sync(mat);
|
wrkDetl.setOrderNo(orderDetl.getOrderNo());
|
wrkDetl.setWrkNo(wrkMast.getWrkNo());
|
wrkDetl.setIoTime(now);
|
wrkDetl.setAnfme(orderDetl.getAnfme()); // 数量
|
wrkDetl.setAppeTime(now);
|
wrkDetl.setAppeUser(userId);
|
wrkDetl.setModiTime(now);
|
wrkDetl.setModiUser(userId);
|
wrkDetl.setZpallet(wrkMast.getBarcode());
|
wrkDetl.setBatch(orderDetl.getBatch());
|
if(Cools.isEmpty(orderDetl.getBatch())){
|
wrkDetl.setBatch("");
|
}
|
wrkDetl.setBoxType1(orderDetl.getBoxType1());
|
wrkDetl.setBoxType2(orderDetl.getBoxType2());
|
wrkDetl.setBoxType3(orderDetl.getBoxType3());
|
wrkDetl.setStandby1(orderDetl.getStandby1());
|
wrkDetl.setStandby2(orderDetl.getStandby2());
|
wrkDetl.setStandby3(orderDetl.getStandby3());
|
// 生成工作档明细
|
wrkDetlService.insert(wrkDetl);
|
|
if (!Cools.isEmpty(orderDetl.getOrderNo())) {
|
OrderPakin order = orderPakinService.selectByNo(orderDetl.getOrderNo());
|
if (Cools.isEmpty(order)){
|
continue;
|
}
|
OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
|
if (Cools.isEmpty(orderDetlPakin)){
|
continue;
|
}
|
if (orderDetlPakin.getAnfme() < (orderDetlPakin.getWorkQty() + orderDetl.getAnfme())) {
|
throw new CoolException("并板数量出错,订单剩余出库数量小于已出库数量与将并板数量之和！！！");
|
}
|
// 修改订单明细作业数量
|
if (!orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), orderDetlPakin.getMatnr(), orderDetlPakin.getBatch(), orderDetlPakin.getBrand(),
|
orderDetlPakin.getStandby1(), orderDetlPakin.getStandby2(), orderDetlPakin.getStandby3(), orderDetlPakin.getBoxType1(), orderDetlPakin.getBoxType2(), orderDetlPakin.getBoxType3(),orderDetl.getAnfme())) {
|
throw new CoolException("修改单据明细工作数量失败");
|
}
|
|
if (order.getSettle() == 1){
|
orderPakinService.updateSettle(order.getId(), 2L, userId);
|
}
|
}
|
}
|
|
return R.ok();
|
}
|
|
@Override
|
@Transactional
|
public R pickConfirm(PickConfirmParam param,Long userId) {
|
|
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
|
.eq("loc_no", param.getLocNo()));
|
if (!locMast.getLocSts().equals("F")) {
|
return R.error("库位状态不是在库");
|
}
|
|
// 判断库位是否冻结
|
String sourceLocFrozen = locMastMapper.findFirstFrozenLocNo(Collections.singletonList(locMast.getLocNo()));
|
if (sourceLocFrozen != null) {
|
throw new CoolException(sourceLocFrozen + "库位已被冻结!");
|
}
|
|
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
|
.eq("type_no", 104)
|
.eq("stn_no", param.getStaNo()));
|
if (staDesc == null) {
|
return R.error("站点不存在");
|
}
|
OrderDetlPakin orderDetlPakin = null;
|
//检验传参是否和订单明细匹配
|
for (PickMatParam matParam : param.getList()) {
|
orderDetlPakin = orderDetlPakinService.selectItem
|
(matParam.getOrderNo(), matParam.getMatnr(),matParam.getBatch(),matParam.getBrand(),
|
matParam.getStandby1(),matParam.getStandby2(),matParam.getStandby3(),
|
matParam.getBoxType1(),matParam.getBoxType2(),matParam.getBoxType3());
|
if (orderDetlPakin == null) {
|
return R.error("物料数据不存在");
|
}
|
|
//剩余可用数量
|
double count = orderDetlPakin.getAnfme() - orderDetlPakin.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(11L); // 工作状态：101.生成出库
|
wrkMast.setIoType(104); // 入出库状态
|
wrkMast.setIoPri(13D); // 优先级：13
|
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
|
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(userId); // 操作人员数据
|
wrkMast.setAppeTime(now);
|
wrkMast.setModiUser(userId);
|
wrkMast.setModiTime(now);
|
wrkMast.setCrnNo(staDesc.getCrnNo());
|
if (!wrkMastService.insert(wrkMast)) {
|
throw new CoolException("保存工作档失败，出库库位号：" + param.getLocNo());
|
}
|
// 生成工作档明细
|
for (PickMatParam matParam : param.getList()) {
|
Wrapper<Mat> wrapper = new EntityWrapper<>();
|
wrapper.eq("status", 1);
|
wrapper.eq("matnr", matParam.getMatnr());
|
Mat mat = matService.selectOne(wrapper);
|
if (mat == null) {
|
throw new CoolException("保存工作档失败，物料信息不存在：" + matParam.getMatnr());
|
}
|
|
WrkDetl wrkDetl = new WrkDetl();
|
wrkDetl.sync(mat);
|
wrkDetl.setBatch(matParam.getBatch());
|
wrkDetl.setOrderNo(matParam.getOrderNo());
|
wrkDetl.setWrkNo(workNo);
|
wrkDetl.setIoTime(now);
|
wrkDetl.setAnfme(matParam.getUseCount()); // 数量
|
wrkDetl.setAppeTime(now);
|
wrkDetl.setAppeUser(userId);
|
wrkDetl.setModiTime(now);
|
wrkDetl.setModiUser(userId);
|
wrkDetl.setZpallet(wrkMast.getBarcode());
|
if(Cools.isEmpty(matParam.getBatch())){
|
wrkDetl.setBatch("");
|
}
|
if (!wrkDetlService.insert(wrkDetl)) {
|
throw new CoolException("保存工作档明细失败");
|
}
|
|
//更新订单工作数量
|
orderDetlPakinService.increaseWorkQty(orderDetlPakin.getOrderId(), matParam.getMatnr(),
|
matParam.getBatch(),matParam.getBrand(),matParam.getStandby1(),matParam.getStandby2(),matParam.getStandby3(),
|
matParam.getBoxType1(),matParam.getBoxType2(),matParam.getBoxType3(),matParam.getUseCount());
|
// 更新工作档状态
|
orderPakinService.updateSettle(orderDetlPakin.getOrderId(),2L,userId);
|
}
|
// 修改库位状态: F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
|
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
|
if (locMast.getLocSts().equals("F")) {
|
locMast.setLocSts("P");
|
locMast.setModiUser(userId);
|
locMast.setModiTime(now);
|
if (!locMastService.updateById(locMast)) {
|
throw new CoolException("预约库位状态失败，库位号：" + param.getLocNo());
|
}
|
} else {
|
throw new CoolException(param.getLocNo() + "库位不是在库状态");
|
}
|
|
return R.ok();
|
}
|
|
@Override
|
@Transactional
|
public R WarehouseOutV1(CombParam combParam, Long hostId, Long userId) {
|
//判断库位状态
|
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", combParam.getLocNo()));
|
if (Cools.isEmpty(locMast)){
|
return R.error("该库位不存在");
|
}
|
if (!locMast.getLocSts().equals("P")){
|
return R.error("该库位状态为："+locMast.getLocSts()+",不满足并板途中拣选条件！！！");
|
}
|
//查询库存数据
|
for (CombParam.CombMat combMat :combParam.getCombMats()){
|
List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
|
.eq("loc_no", combParam.getLocNo())
|
.eq("matnr", combMat.getMatnr())
|
);
|
if (locDetlList.isEmpty()){
|
return R.error("未查询到库存数据");
|
}
|
if (locDetlList.size()>1){
|
return R.error("库存数据大于1条，为保证数据准确性，请用正常流程出库！！！");
|
}
|
LocDetl locDetl = locDetlList.get(0);
|
if (combMat.getAnfme() > locDetl.getAnfme()){
|
return R.error("拣选数量错误，超出库存数量");
|
}
|
if (!Cools.isEmpty(combMat.getOrderNo())){
|
OrderPakout orderPakout = orderPakoutService.selectByNo(combMat.getOrderNo());
|
if (Cools.isEmpty(orderPakout)){
|
continue;
|
}
|
if (orderPakout.getSettle() == 1){
|
OrderInAndOutUtil.updateOrder(false,orderPakout.getId(), 2L, 9527L);
|
}
|
OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderPakout.getId(), combMat.getMatnr(), combMat.getBatch(),
|
combMat.getBrand(), combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3());
|
if (Cools.isEmpty(orderDetlPakout)){
|
continue;
|
}
|
if (orderDetlPakout.getAnfme() < (orderDetlPakout.getWorkQty()+combMat.getAnfme())){
|
throw new CoolException("拣选数量出错,订单剩余出库数量小于已出库数量与将拣选数量之和！！！");
|
}
|
// 修改订单明细作业数量
|
if (!orderDetlPakoutService.increaseWorkQty(orderDetlPakout.getOrderId(), combMat.getMatnr(), combMat.getBatch(), combMat.getBrand(),
|
combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3(),combMat.getAnfme())) {
|
throw new CoolException("修改单据明细工作数量失败");
|
}
|
// // 修改订单明细完成数量
|
// if (!orderDetlPakoutService.increase(orderPakout.getId(),combMat.getMatnr(), combMat.getBatch(), combMat.getBrand(),
|
// combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3(),combMat.getAnfme())) {
|
// throw new CoolException("修改单据明细完成数量失败");
|
// }
|
// // 修改订单状态 作业中 ===>> 已完成
|
// orderPakoutService.checkComplete(combMat.getOrderNo());
|
}
|
try {
|
Date now = new Date();
|
// 创建入库工作档
|
WrkMast wrkMast = new WrkMast();
|
wrkMast.setWrkNo(commonService.getWorkNo(2));
|
wrkMast.setIoTime(now);
|
wrkMast.setWrkSts(14L); // 工作状态：出库完成
|
wrkMast.setIoType(108); // 入出库状态：出库，拣料入库
|
wrkMast.setIoPri(13D); // 优先级
|
wrkMast.setCrnNo(1);
|
wrkMast.setSourceStaNo(1);
|
wrkMast.setStaNo(1);
|
wrkMast.setSourceLocNo(combParam.getLocNo());
|
wrkMast.setBarcode(combParam.getBarcode()); // 托盘码
|
wrkMast.setFullPlt("Y"); // 满板：Y
|
wrkMast.setPicking("N"); // 拣料
|
wrkMast.setExitMk("N"); // 退出
|
wrkMast.setEmptyMk("N"); // 空板
|
wrkMast.setLinkMis("Y");
|
wrkMast.setCtnType(0); // 容器类型
|
// 操作人员数据
|
wrkMast.setAppeTime(now);
|
wrkMast.setModiTime(now);
|
wrkMast.setAppeUser(userId);
|
wrkMast.setModiUser(userId);
|
wrkMastService.insert(wrkMast);
|
|
Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr",combMat.getMatnr()));
|
if (mat == null) {
|
throw new CoolException("保存工作档失败，物料信息不存在：" + combMat.getMatnr());
|
}
|
|
WrkDetl wrkDetl = new WrkDetl();
|
wrkDetl.sync(mat);
|
wrkDetl.setOrderNo(combMat.getOrderNo());
|
wrkDetl.setWrkNo(wrkMast.getWrkNo());
|
wrkDetl.setIoTime(now);
|
wrkDetl.setAnfme(combMat.getAnfme()); // 数量
|
wrkDetl.setAppeTime(now);
|
wrkDetl.setAppeUser(userId);
|
wrkDetl.setModiTime(now);
|
wrkDetl.setModiUser(userId);
|
wrkDetl.setZpallet(wrkMast.getBarcode());
|
wrkDetl.setBatch(combMat.getBatch());
|
if(Cools.isEmpty(combMat.getBatch())){
|
wrkDetl.setBatch("");
|
}
|
wrkDetl.setBoxType1(combMat.getBoxType1());
|
wrkDetl.setBoxType2(combMat.getBoxType2());
|
wrkDetl.setBoxType3(combMat.getBoxType3());
|
wrkDetl.setStandby1(combMat.getStandby1());
|
wrkDetl.setStandby2(combMat.getStandby2());
|
wrkDetl.setStandby3(combMat.getStandby3());
|
// 生成工作档明细
|
wrkDetlService.insert(wrkDetl);
|
System.out.println("正常");
|
|
}catch (Exception e) {
|
throw new CoolException("操作数据异常："+e.getMessage());
|
}
|
}
|
return R.ok("操作成功！");
|
}
|
|
@Override
|
public R orderOutListOrder(String barcode, Long userId) {
|
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", 104));
|
wrkMastArrayList.addAll(wrkMasts);
|
List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.eq("wrk_sts", 14L)
|
.eq("io_type", 107));
|
wrkMastArrayList.addAll(wrkMasts1);
|
} else {
|
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.like("barcode", barcode)
|
.eq("wrk_sts", 199L)
|
.eq("io_type", 104));
|
wrkMastArrayList.addAll(wrkMasts);
|
List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.like("barcode", barcode)
|
.eq("wrk_sts", 199L)
|
.eq("io_type", 107));
|
wrkMastArrayList.addAll(wrkMasts1);
|
}
|
return R.ok().add(wrkMastArrayList);
|
}
|
|
@Override
|
public R orderOutListOrderPick(String barcode, Long userId) {
|
ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
|
if (Cools.isEmpty(barcode) || barcode.isEmpty()) {
|
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.eq("wrk_sts", 199L)
|
.eq("io_type", 103));
|
wrkMastArrayList.addAll(wrkMasts);
|
List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.eq("wrk_sts", 199L)
|
.eq("io_type", 107));
|
wrkMastArrayList.addAll(wrkMasts1);
|
} else {
|
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.like("barcode", barcode)
|
.eq("wrk_sts", 199L)
|
.eq("io_type", 103)
|
);
|
wrkMastArrayList.addAll(wrkMasts);
|
List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
|
.like("barcode", barcode)
|
.eq("wrk_sts", 199L)
|
.eq("io_type", 107));
|
wrkMastArrayList.addAll(wrkMasts1);
|
}
|
return R.ok().add(wrkMastArrayList);
|
}
|
|
@Override
|
public R pickMats(String matnr, String orderNo) {
|
List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().like("pakin", "1"));
|
ArrayList<Long> typeList = new ArrayList<>();
|
for (DocType docType : docTypes) {
|
typeList.add(docType.getDocId());
|
}
|
|
Wrapper<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());
|
}
|
|
//搜索明细
|
Wrapper<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.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);
|
}
|
|
@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()!=6){
|
throw new CoolException("条码长度不是6位===>>" + 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.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
|
elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
|
if (DetlDto.has(detlDtos, detlDto)) {
|
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
|
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);
|
waitPakin.setStandby1(detlDto.getStandby1());
|
waitPakin.setStandby2(detlDto.getStandby2());
|
waitPakin.setStandby3(detlDto.getStandby3());
|
waitPakin.setStandby1(detlDto.getStandby1());
|
waitPakin.setStandby2(detlDto.getStandby2());
|
waitPakin.setStandby3(detlDto.getStandby3());
|
if (!waitPakinService.insert(waitPakin)) {
|
throw new CoolException("保存入库通知档失败");
|
}
|
}
|
// 关联组托
|
} else {
|
// Order order = orderService.selectByNo(param.getOrderNo());
|
Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, 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());
|
OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
|
elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3());
|
if (elem.getAnfme() > orderDetl.getEnableQty()) {
|
throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
|
}
|
// 修改订单作业数量
|
// if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
|
// throw new CoolException("修改单据作业数量失败");
|
// }
|
OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
|
elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
|
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
|
elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
|
if (DetlDto.has(detlDtos, detlDto)) {
|
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
|
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.setOrderNo(order.getOrderNo()); // 单据编号
|
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);
|
waitPakin.setStandby1(detlDto.getStandby1());
|
waitPakin.setStandby2(detlDto.getStandby2());
|
waitPakin.setStandby3(detlDto.getStandby3());
|
waitPakin.setStandby1(detlDto.getStandby1());
|
waitPakin.setStandby2(detlDto.getStandby2());
|
waitPakin.setStandby3(detlDto.getStandby3());
|
if (!waitPakinService.insert(waitPakin)) {
|
throw new CoolException("保存入库通知档失败");
|
}
|
}
|
// orderService.updateSettle(order.getId(), 2L, userId);
|
OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
|
}
|
|
}
|
|
@Override
|
@Transactional
|
public R kittingQuery(CombParam combParam, Long userId) {
|
List<Map<String, Object>> result = new ArrayList<>();
|
List<LocDetl> locDetlResultList = new ArrayList<>();
|
List<LocDetl> locDetlResultListHalf = new ArrayList<>();
|
List<CombParam.CombMat> combMats = combParam.getCombMats();
|
for (CombParam.CombMat combMat : combMats){
|
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
|
.eq("matnr", combMat.getMatnr())
|
.eq("specs", combMat.getSpecs())
|
.eq("sku", combMat.getSku())
|
.eq("origin", "不在库");
|
List<LocDetl> locDetlList = locDetlService.selectList(wrapper);
|
for (LocDetl locDetl : locDetlList){
|
LocDetlFusion locDetlFusion = getLocDetlFusion(combParam, locDetl.getLocNo());
|
if (locDetlFusion.sign != 0 && locDetlFusion.sign != 9999){
|
if (locDetlFusion.sign == combMats.size()){
|
locDetlResultList.add(locDetlFusion.locDetl);
|
} else {
|
locDetlResultListHalf.add(locDetlFusion.locDetl);
|
}
|
}
|
}
|
}
|
for (LocDetl locDetl : locDetlResultList){
|
Map<String, Object> map = new HashMap<>();
|
map.put("locNo", locDetl.getLocNo());
|
map.put("matnr", locDetl.getMatnr());
|
map.put("sku", locDetl.getSku());
|
map.put("anfme", locDetl.getAnfme());
|
map.put("memo", locDetl.getMemo());
|
result.add(map);
|
}
|
for (LocDetl locDetl : locDetlResultListHalf){
|
Map<String, Object> map = new HashMap<>();
|
map.put("locNo", locDetl.getLocNo());
|
map.put("matnr", locDetl.getMatnr());
|
map.put("sku", locDetl.getSku());
|
map.put("anfme", locDetl.getAnfme());
|
map.put("memo", locDetl.getMemo());
|
result.add(map);
|
}
|
|
return R.ok().add(result);
|
}
|
|
public class LocDetlFusion{
|
public Integer sign;
|
public LocDetl locDetl;
|
|
public LocDetlFusion(Integer sign, LocDetl locDetl) {
|
this.sign = sign;
|
this.locDetl = locDetl;
|
}
|
}
|
|
public LocDetlFusion getLocDetlFusion(CombParam combParam,String locNo){
|
LocDetl locDetl = new LocDetl();
|
locDetl.setLocNo(locNo);
|
locDetl.setAnfme(0D);
|
Integer sign = 0;
|
Map<Integer, LocDetl> map = new HashMap<>();
|
List<LocDetl> locDetls= new ArrayList<>();
|
|
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
|
if (locMast.getLocSts().equals("F")){
|
List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
|
for (CombParam.CombMat combMatNow : combParam.getCombMats()){
|
boolean flag = true;
|
while (flag){
|
flag = false;
|
for (LocDetl locDetlNow : locDetlList){
|
if (locDetlNow.getOrigin().equals("不在库")){
|
if (combMatNow.getMatnr().equals(locDetlNow.getMatnr())){
|
if (combMatNow.getAnfme().equals(locDetlNow.getAnfme())){
|
LocDetl locDetlAdd = new LocDetl();
|
|
locDetlAdd.sync(locDetlNow);
|
locDetls.add(locDetlAdd);
|
locDetlList.remove(locDetlNow);
|
|
sign++;
|
combMatNow.setMemo("完全匹配");
|
break;
|
} else if (combMatNow.getAnfme()>locDetlNow.getAnfme()){
|
double anfme = combMatNow.getAnfme() - locDetlNow.getAnfme();
|
combMatNow.setAnfme(anfme);
|
|
LocDetl locDetlAdd = new LocDetl();
|
locDetlAdd.sync(locDetlNow);
|
locDetls.add(locDetlAdd);
|
|
locDetlList.remove(locDetlNow);
|
flag = true;
|
break;
|
} else if (combMatNow.getAnfme()<locDetlNow.getAnfme()){
|
double anfme = locDetlNow.getAnfme() - combMatNow.getAnfme();
|
locDetlNow.setAnfme(combMatNow.getAnfme());
|
|
LocDetl locDetlAdd = new LocDetl();
|
locDetlAdd.sync(locDetlNow);
|
locDetls.add(locDetlAdd);
|
|
locDetlNow.setAnfme(anfme);
|
sign++;
|
combMatNow.setMemo("完全匹配");
|
break;
|
}
|
}
|
}
|
}
|
}
|
}
|
if (sign == combParam.getCombMats().size()){
|
if (locDetlList.size() == 0 ){
|
locDetl.setMemo("完全匹配");
|
} else {
|
locDetl.setMemo("溢出匹配");
|
}
|
} else if (locDetls.size() != 0 ){
|
locDetl.setMemo("未完全匹配");
|
sign = 99999999;
|
}
|
}
|
for (LocDetl locDetlNow : locDetls){
|
if (Cools.isEmpty(locDetl.getMatnr())){
|
locDetl.setMatnr(locDetlNow.getMatnr());
|
} else {
|
locDetl.setMatnr(locDetl.getMatnr() + "," + locDetlNow.getMatnr());
|
}
|
if (Cools.isEmpty(locDetl.getSku())){
|
locDetl.setSku(locDetlNow.getSku());
|
} else {
|
locDetl.setSku(locDetl.getSku() + "," + locDetlNow.getSku());
|
}
|
locDetl.setAnfme(locDetlNow.getAnfme() + locDetl.getAnfme());
|
}
|
return new LocDetlFusion(sign,locDetl);
|
}
|
|
@Override
|
@Transactional
|
public void kittingCall(String locNo, Long userId) {
|
try{
|
List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
|
|
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
|
if (locMast.getLocSts().equals("F")){
|
List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
|
for (LocDetl locDetl:locDetlList){
|
StockOutParam.LocDetl locDto = new StockOutParam.LocDetl();
|
locDto.setLocNo(locDetl.getLocNo());
|
locDto.setMatnr(locDetl.getMatnr());
|
locDto.setBatch(locDetl.getBatch());
|
locDto.setBrand(locDetl.getBrand());
|
locDto.setCount(locDetl.getAnfme());
|
locDto.setStandby1(locDetl.getStandby1());
|
locDto.setStandby2(locDetl.getStandby2());
|
locDto.setStandby3(locDetl.getStandby3());
|
locDto.setBoxType1(locDetl.getBoxType1());
|
locDto.setBoxType2(locDetl.getBoxType2());
|
locDto.setBoxType3(locDetl.getBoxType3());
|
locDetls.add(locDto);
|
}
|
}
|
StockOutParam param = new StockOutParam();
|
param.setOutSite(101);
|
param.setLocDetls(locDetls);
|
WorkService workService = SpringUtils.getBean(WorkService.class);
|
workService.locCheckOut(param,userId);
|
} catch (Exception e){
|
throw new CoolException("盘点启动失败！！！");
|
}
|
}
|
|
@Override
|
@Transactional
|
public R locOriginInOut(LocDetl locDetl, Long userId) {
|
try{
|
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
|
.eq("loc_no", locDetl.getLocNo())
|
.eq("zpallet", locDetl.getZpallet())
|
.eq("matnr", locDetl.getMatnr())
|
.eq("specs", locDetl.getSpecs())
|
.eq("batch", locDetl.getBatch())
|
.eq("origin", locDetl.getOrigin());
|
LocDetl locDetl1 = locDetlService.selectOne(wrapper);
|
if (Cools.isEmpty(locDetl1)){
|
return R.error();
|
} else if (locDetl1.getOrigin().equals("不在库")){
|
locDetl1.setOrigin("在库");
|
}else{
|
locDetl1.setOrigin("不在库");
|
}
|
if (locDetlService.update(locDetl1,wrapper)){
|
return R.ok();
|
}
|
} catch (Exception e){
|
|
}
|
return R.error();
|
}
|
// 商品上架
|
@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(), elem.getBatch(),analyse.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
|
elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
|
|
// 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.findDto(detlDtos, detlDto);
|
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);
|
Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
|
|
if (null == order) {
|
throw new CoolException("生成单据失败");
|
}
|
// if (!orderService.updateSettle(order.getId(), 2L, userId)) {
|
// throw new CoolException("修改单据状态失败");
|
// }
|
OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
|
|
// 生成入库通知档
|
for (DetlDto detlDto : detlDtos) {
|
|
// 修改作业数量 ----------------------------------------
|
// 订单明细数量校验
|
// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
|
OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
|
,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3());
|
if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
|
throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
|
}
|
// 修改订单作业数量
|
// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
|
// throw new CoolException("修改单据作业数量失败");
|
// }
|
OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
|
,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme());
|
// 保存入库通知档
|
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 = OrderInAndOutUtil.selectByNo(Boolean.FALSE, orderNo);
|
// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
|
if (order.getSettle() != 1 && order.getSettle() != 2){
|
throw new CoolException("该订单已处理");
|
}
|
|
// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
|
List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
|
|
Date now = new Date();
|
for(OrderDetl orderDetl : orderDetls){
|
//查询所有库位状态为F的库位信息
|
List<LocDetl> 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<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("更新订单状态失败");
|
// }
|
OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),2L,userId);
|
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("更新订单明细失败");
|
// }
|
OrderInAndOutUtil.updateOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
|
|
}
|
|
}
|
}
|
|
@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() + "库位不是在库状态");
|
}
|
}
|
}
|
