|
|
|
@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
|
|
import com.glxp.api.annotation.AuthRuleAnnotation;
|
|
|
|
|
import com.glxp.api.annotation.Log;
|
|
|
|
|
import com.glxp.api.annotation.RepeatSubmit;
|
|
|
|
|
import com.glxp.api.common.enums.ResultEnum;
|
|
|
|
|
import com.glxp.api.common.res.BaseResponse;
|
|
|
|
|
import com.glxp.api.common.util.ResultVOUtils;
|
|
|
|
@ -193,6 +194,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//新增业务-立即提交
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("warehouse/inout/submitBiz")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
@ -235,6 +237,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//新增扫码单据-立即提交
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("warehouse/inout/submitCodes")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
@ -265,6 +268,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//新增业务单据,新增扫码单据,等待校验-草稿保存
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("warehouse/inout/saveOrderWeb")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
@ -288,7 +292,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
basicCorpService.insert(basicCorpEntity);
|
|
|
|
|
}
|
|
|
|
|
orderEntity.setFromCorp(basicCorpEntity.getErpId());
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
orderEntity.setFromCorp(addOrderRequest.getFromCorp());
|
|
|
|
|
}
|
|
|
|
|
orderEntity.setAction(addOrderRequest.getAction());
|
|
|
|
@ -312,6 +316,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//等待校验-立即提交
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("warehouse/inout/submitOrderWeb")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
@ -373,6 +378,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//带配货-立即提交
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("warehouse/inout/waitAllocate/submitOrderWeb")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
@ -477,6 +483,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//已验收单据撤回
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/inout/order/received/rollback")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
@ -520,6 +527,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//已校验单据撤回到等待处理
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/inout/order/unReceive/rollback")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
@ -681,6 +689,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
* @param billNo
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@GetMapping("/udiwms/inout/order/submitToThrSys")
|
|
|
|
|
public BaseResponse submitToThrSys(@RequestParam("billNo") String billNo) {
|
|
|
|
|
if (StrUtil.isBlank(billNo)) {
|
|
|
|
@ -725,6 +734,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
@Resource
|
|
|
|
|
InvWarehouseService invWarehouseService;
|
|
|
|
|
|
|
|
|
|
@RepeatSubmit()
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("/udiwms/stock/order/change")
|
|
|
|
|
public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) {
|
|
|
|
@ -783,7 +793,6 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
originCodes.forEach(
|
|
|
|
|
code -> {
|
|
|
|
|
//复制选中的产品
|
|
|
|
|