package com.zy.asrs.controller;
|
|
import com.alibaba.fastjson.JSONObject;
|
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
import com.baomidou.mybatisplus.mapper.Wrapper;
|
import com.baomidou.mybatisplus.plugins.Page;
|
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.model.enums.WorkNoType;
|
import com.zy.common.service.CommonService;
|
import com.zy.common.web.BaseController;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.web.bind.annotation.*;
|
|
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 StaDescService staDescService;
|
@Autowired
|
private CommonService commonService;
|
@Autowired
|
private MatService matService;
|
@Autowired
|
private BomMatService bomMatService;
|
|
// 商品上架
|
@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("/check/mergeStore/barcode")
|
@ManagerAuth
|
public R mergeStoreBarcode(@RequestParam String barcode){
|
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
|
if (Cools.isEmpty(wrkMast)) {
|
throw new CoolException("当前托盘码" + barcode + "没有任务，请检查！");
|
}
|
if (wrkMast.getIoType() != 104) {
|
throw new CoolException("当前托盘码" + barcode + "非并板出库");
|
}
|
if (wrkMast.getWrkSts() != 14L) {
|
throw new CoolException("当前托盘码" + barcode + "出库未完成");
|
}
|
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
|
return R.ok().add(wrkDetl.getBomCode());
|
}
|
|
@RequestMapping("/comb/auth")
|
@ManagerAuth(memo = "组托")
|
public R comb(@RequestBody CombParam combParam){
|
mobileService.comb(combParam, getUserId());
|
return R.ok("组托成功");
|
}
|
|
@RequestMapping("/comb/auth2")
|
@ManagerAuth(memo = "组托")
|
public R comb2(@RequestBody CombParam combParam){
|
mobileService.comb2(combParam, getUserId());
|
return R.ok("组托成功");
|
}
|
|
@RequestMapping("/comb/auth3")
|
@ManagerAuth(memo = "组托")
|
public R comb3(@RequestBody CombParam combParam){
|
mobileService.comb3(combParam, getUserId());
|
return R.ok("组托成功");
|
}
|
|
@RequestMapping("/check/fullplt/auth")
|
@ManagerAuth(memo = "检测物料是否有未满托托盘")
|
public R checkFullplt(@RequestBody CombParam.CombMat combMat){
|
List<LocMast> locMasts = mobileService.checkFullplt(combMat, getUserId());
|
return R.ok().add(locMasts);
|
}
|
|
|
@RequestMapping("/merge/comb/auth")
|
@ManagerAuth(memo = "并板")
|
public R mergeComb(@RequestBody CombParam combParam){
|
mobileService.mergeComb(combParam, getUserId());
|
return R.ok("组托成功");
|
}
|
|
@RequestMapping("/merge/out/auth")
|
@ManagerAuth(memo = "pda并板出库")
|
public R mergeOut(@RequestParam String locNo,@RequestParam String staNo){
|
mobileService.mergeOut(locNo,staNo, getUserId());
|
return R.ok("出库成功");
|
}
|
|
@RequestMapping("/merge/comb2/auth")
|
@ManagerAuth(memo = "并板")
|
public R mergeComb2(@RequestBody CombParam combParam){
|
mobileService.mergeComb2(combParam, getUserId());
|
return R.ok("并板成功");
|
}
|
|
@RequestMapping("/comb/checkBom")
|
@ManagerAuth(memo = "校验Bom")
|
public R checkBom(@RequestBody CheckBom checkBom){
|
BomMat bomMat = new BomMat();
|
// 没有输入bom号正常组托
|
if (Cools.isEmpty(checkBom.getBomCode())) {
|
return R.ok();
|
}
|
|
if (Cools.isEmpty(checkBom.getMatnr())) {
|
return R.ok().add(bomMat);
|
} else {
|
// 检查是否在bom清单内
|
bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("bom_num", checkBom.getBomCode()).eq("element_num", checkBom.getMatnr()));
|
if (Cools.isEmpty(bomMat)) {
|
throw new CoolException("当前物料" + checkBom.getMatnr() + "不在Bom清单内");
|
} else {
|
// 检查库存中是否有当前bom的物料
|
Double bomQyt = locDetlService.getBomQyt(checkBom.getBomCode(), checkBom.getMatnr());
|
if (!Cools.isEmpty(bomQyt)) {
|
bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt);
|
}
|
Double bomQty = wrkDetlService.getBomQty(checkBom.getBomCode(), checkBom.getMatnr());
|
if (!Cools.isEmpty(bomQty)) {
|
bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty);
|
}
|
// 检查工作档中是否有当前bom的物料
|
|
}
|
}
|
return R.ok().add(bomMat);
|
}
|
|
@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(required = false) String barcode,
|
@RequestParam(required = false) Integer staNo,
|
@RequestParam(required = false) String matnr){
|
if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
|
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();
|
}
|
|
// 根据库位码和商品码搜索商品
|
@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("出库成功");
|
}
|
|
//平库pda上架
|
@RequestMapping("/manDetl/in")
|
public R manDetlAdd(@RequestBody JSONObject json){
|
if (json == null){
|
return R.error("传入数据为空");
|
}
|
return mobileService.manDetlIn(json);
|
}
|
|
//平库pda下架
|
@RequestMapping("/manDetl/out")
|
public R manDetlDelete(@RequestBody JSONObject json){
|
if (json == null){
|
return R.error("传入数据为空");
|
}
|
return mobileService.manDetlOut(json);
|
}
|
|
@RequestMapping("/loc/f/list")
|
@ManagerAuth(memo = "获取在库库位")
|
public R locNoF(@RequestParam(required = false) String locNo){
|
Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("loc_sts", "F");
|
if (!Cools.isEmpty(locNo)) {
|
wrapper.like("loc_no", locNo);
|
}
|
List<LocMast> list = locMastService.selectList(wrapper);
|
return R.ok().add(list);
|
}
|
|
@RequestMapping("/pick/sta/list")
|
@ManagerAuth(memo = "获取并板站")
|
public R pickSta(){
|
List<StaDesc> list = staDescService.selectList(new EntityWrapper<StaDesc>().eq("type_no",104));
|
return R.ok().add(list);
|
}
|
|
@RequestMapping("/pick/mat/list")
|
@ManagerAuth(memo = "获取并板物料")
|
public R pickMats(@RequestParam(required = false) String matnr){
|
List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().like("doc_name", "入库"));
|
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());
|
}
|
|
//搜索明细
|
Wrapper<OrderDetl> wrapper1 = new EntityWrapper<OrderDetl>();
|
wrapper1.eq("status", 1);
|
wrapper1.in("order_id", orderIds);
|
if (!Cools.isEmpty(matnr)) {
|
wrapper1.like("matnr", matnr);
|
}
|
|
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(0D);
|
maps.add(matParam);
|
}
|
return R.ok().add(maps);
|
}
|
|
@RequestMapping("/pick/in")
|
@ManagerAuth(memo = "并板入库")
|
@Transactional
|
public R pickConfirm(@RequestBody PickConfirmParam param){
|
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
|
if (!locMast.getLocSts().equals("F")) {
|
return R.error("库位状态不是在库");
|
}
|
|
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
|
.eq("type_no", 104)
|
.eq("stn_no", param.getStaNo()));
|
if (staDesc == null) {
|
return R.error("站点不存在");
|
}
|
|
//检验传参是否和订单明细匹配
|
for (PickMatParam matParam : param.getList()) {
|
Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>()
|
.eq("order_no", matParam.getOrderNo())
|
.eq("status", 1)
|
.eq("matnr", matParam.getMatnr());
|
if (!Cools.isEmpty(matParam.getBatch())) {
|
wrapper.eq("batch", matParam.getBatch());
|
}
|
OrderDetl orderDetl = orderDetlService.selectOne(wrapper);
|
if (orderDetl == null) {
|
return R.error("物料数据不存在");
|
}
|
|
//剩余可用数量
|
double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
|
if (matParam.getCount() != count) {
|
return R.error("物料数据已过期");
|
}
|
|
if (matParam.getUseCount() > count) {
|
return R.error("可用数量不足");
|
}
|
}
|
|
Date now = new Date();
|
// 生成工作号
|
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(104));
|
// 生成工作档
|
WrkMast wrkMast = new WrkMast();
|
wrkMast.setWrkNo(workNo);
|
wrkMast.setIoTime(now);
|
wrkMast.setWrkSts(101L); // 工作状态：101.生成出库
|
wrkMast.setIoType(104); // 入出库状态
|
wrkMast.setIoPri(13D); // 优先级：13
|
wrkMast.setSourceStaNo(staDesc.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(getUserId()); // 操作人员数据
|
wrkMast.setAppeTime(now);
|
wrkMast.setModiUser(getUserId());
|
wrkMast.setModiTime(now);
|
wrkMast.setCrnNo(staDesc.getCrnNo());
|
if (!wrkMastService.insert(wrkMast)) {
|
throw new CoolException("保存工作档失败，出库库位号：" + param.getLocNo());
|
}
|
// 生成工作档明细
|
for (PickMatParam matParam : param.getList()) {
|
EntityWrapper<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.setOrderNo(matParam.getOrderNo());
|
wrkDetl.setWrkNo(workNo);
|
wrkDetl.setZpallet(wrkMast.getBarcode());
|
wrkDetl.setIoTime(now);
|
wrkDetl.setAnfme(matParam.getUseCount()); // 数量
|
wrkDetl.setAppeTime(now);
|
wrkDetl.setAppeUser(getUserId());
|
wrkDetl.setModiTime(now);
|
wrkDetl.setModiUser(getUserId());
|
if (!wrkDetlService.insert(wrkDetl)) {
|
throw new CoolException("保存工作档明细失败");
|
}
|
|
//更新订单工作数量
|
orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount());
|
}
|
// 修改库位状态: F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
|
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
|
if (locMast.getLocSts().equals("F")) {
|
locMast.setLocSts("P");
|
locMast.setModiUser(getUserId());
|
locMast.setModiTime(now);
|
if (!locMastService.updateById(locMast)) {
|
throw new CoolException("预约库位状态失败，库位号：" + param.getLocNo());
|
}
|
} else {
|
throw new CoolException(param.getLocNo() + "库位不是在库状态");
|
}
|
|
return R.ok();
|
}
|
|
@RequestMapping("/adjustNew/v2/auth")
|
@ManagerAuth(memo = "补货")
|
public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
|
mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
|
return R.ok("补货成功");
|
}
|
|
}
|
