代码备份

dev_2.5_csconfilt
yewj 7 months ago
parent 5987b9a8bb
commit c7a1cb31e2

@ -76,7 +76,7 @@ public class IoCollectOrderCodeManController extends BaseController {
* @return * @return
*/ */
@PostMapping("/udiwms/ioSplit/collect/order/tagCode") @PostMapping("/udiwms/ioSplit/collect/order/tagCode")
@CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_ADD_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.code"}, waitTime = 1, leaseTime = 6, timeOutMsg = "扫码重复提交") @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_ADD_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.code"}, waitTime = 1, leaseTime = 3, timeOutMsg = "扫码重复提交")
public BaseResponse prescribeTagCode(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust, public BaseResponse prescribeTagCode(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
@ -133,7 +133,7 @@ public class IoCollectOrderCodeManController extends BaseController {
* @return * @return
*/ */
@PostMapping("/udiwms/ioSplit/collect/order/batchAddCode") @PostMapping("/udiwms/ioSplit/collect/order/batchAddCode")
@CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_BATCH_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.codeList", "#addTagCodeReqeust.code"}, leaseTime = 6, timeOutMsg = "扫码重复提交") @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_BATCH_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.codeList", "#addTagCodeReqeust.code"}, leaseTime = 3, timeOutMsg = "扫码重复提交")
public BaseResponse batchAddCode(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust, public BaseResponse batchAddCode(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {

@ -368,7 +368,7 @@ public class IoCodeTempController extends BaseController {
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@CusRedissonAnnotation(cacheName = RedissonCacheKey.ENTER_CODE_VAIL, key = { "#addEnterCodeRequest.codeList"}, timeOutMsg = "重复扫码") @CusRedissonAnnotation(cacheName = RedissonCacheKey.ENTER_CODE_VAIL, key = {"#addEnterCodeRequest.codeList"}, timeOutMsg = "重复扫码")
@PostMapping("warehouse/inout/batchVailCode") @PostMapping("warehouse/inout/batchVailCode")
public BaseResponse batchVailCode(@RequestBody @Valid AddEnterCodeRequest addEnterCodeRequest) { public BaseResponse batchVailCode(@RequestBody @Valid AddEnterCodeRequest addEnterCodeRequest) {
List<String> codeList = addEnterCodeRequest.getCodeList(); List<String> codeList = addEnterCodeRequest.getCodeList();
@ -1167,7 +1167,6 @@ public class IoCodeTempController extends BaseController {
} }
} }
BaseResponse baseResponse = checkRelId(codeEnttity, unitFk); BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
if (baseResponse != null) { if (baseResponse != null) {
deleteEmptyBillNo(orderEntity); deleteEmptyBillNo(orderEntity);
@ -1186,7 +1185,6 @@ public class IoCodeTempController extends BaseController {
return baseResponse; return baseResponse;
} }
if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) { if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) {
if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse.getId(), 2)) { //校验预验收库存 if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse.getId(), 2)) { //校验预验收库存
BaseResponse invRes = checkInvService.checkPreInInv(bussinessTypeEntity, codeEnttity, false); BaseResponse invRes = checkInvService.checkPreInInv(bussinessTypeEntity, codeEnttity, false);

Loading…
Cancel
Save