|
|
@ -921,13 +921,13 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
codeEnttity.setPrice(udiRelevanceResponse.getPrice());
|
|
|
|
codeEnttity.setPrice(udiRelevanceResponse.getPrice());
|
|
|
|
codeEnttity.setInBatchNo(inBatch);
|
|
|
|
codeEnttity.setInBatchNo(inBatch);
|
|
|
|
//是否边扫边校验
|
|
|
|
//是否边扫边校验
|
|
|
|
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
|
|
|
|
if (bussinessTypeEntity.getCheckWebNew() == 1 && bussinessTypeEntity.isCheckEnable()) {
|
|
|
|
String errMsg = ioCheckInoutService.checkCode(codeEnttity);
|
|
|
|
String errMsg = ioCheckInoutService.checkCode(codeEnttity);
|
|
|
|
if (errMsg != null) {
|
|
|
|
if (errMsg != null) {
|
|
|
|
return ResultVOUtils.error(500, errMsg);
|
|
|
|
return ResultVOUtils.error(500, errMsg);
|
|
|
|
} else
|
|
|
|
} else
|
|
|
|
codeTempService.insert(codeEnttity);
|
|
|
|
codeTempService.insert(codeEnttity);
|
|
|
|
} else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
|
|
|
|
} else if ((bussinessTypeEntity.getCheckWebNew() == 3 || bussinessTypeEntity.getCheckWebNew() == 2) && bussinessTypeEntity.isCheckEnable()) {
|
|
|
|
String errMsg = ioCheckInoutService.checkNoPiCode(codeEnttity);
|
|
|
|
String errMsg = ioCheckInoutService.checkNoPiCode(codeEnttity);
|
|
|
|
if (errMsg != null) {
|
|
|
|
if (errMsg != null) {
|
|
|
|
return ResultVOUtils.error(500, errMsg);
|
|
|
|
return ResultVOUtils.error(500, errMsg);
|
|
|
|