|
|
@ -1,5 +1,6 @@
|
|
|
|
package com.glxp.api.controller.inout;
|
|
|
|
package com.glxp.api.controller.inout;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
|
import com.glxp.api.annotation.CusRedissonAnnotation;
|
|
|
|
import com.glxp.api.annotation.CusRedissonAnnotation;
|
|
|
|
import com.glxp.api.constant.*;
|
|
|
|
import com.glxp.api.constant.*;
|
|
|
@ -112,6 +113,8 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
IoCollectOrderService collectOrderService;
|
|
|
|
IoCollectOrderService collectOrderService;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
IoCollectCodeService ioCollectCodeService;
|
|
|
|
IoCollectCodeService ioCollectCodeService;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
IoSplitFifoInvService ioSplitFifoInvService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* PDA-----单据上传
|
|
|
|
* PDA-----单据上传
|
|
|
@ -576,6 +579,10 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
if (ioOrderEntity != null) {
|
|
|
|
if (ioOrderEntity != null) {
|
|
|
|
addOrderRequest.setBillNo(ioOrderEntity.getBillNo());
|
|
|
|
addOrderRequest.setBillNo(ioOrderEntity.getBillNo());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//TODO 退货校验是否有库存 提示产品不存在
|
|
|
|
|
|
|
|
if(StrUtil.equals("return",addOrderRequest.getSplitType())){
|
|
|
|
|
|
|
|
//ioSplitFifoInvService.getOne(new LambdaQueryWrapper<IoSplitFifoInv>().eq(IoSplitFifoInv::getInvCode,"").last("limit 1"));
|
|
|
|
|
|
|
|
}
|
|
|
|
if (IntUtil.value(udiEntity.getProductType()) == 2) {
|
|
|
|
if (IntUtil.value(udiEntity.getProductType()) == 2) {
|
|
|
|
return adddGrugOrder(addOrderRequest, udiEntity, code);
|
|
|
|
return adddGrugOrder(addOrderRequest, udiEntity, code);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|