|
|
|
@ -395,6 +395,40 @@ public class IoCodeTempController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//是否校验产品属性 :1:校验;2.无需校验
|
|
|
|
|
if(bussinessTypeEntity.getVailProductAttributes() == 1 ){
|
|
|
|
|
Integer purType = udiInfoEntity.getPurType(); //1:普通入账产品;2.预验收产品。3:寄售产品
|
|
|
|
|
int actionType = bussinessTypeEntity.getActionType(); //1:带票(正常);2.预验收。3:寄售
|
|
|
|
|
if (purType != actionType){
|
|
|
|
|
//包装友好提示
|
|
|
|
|
String msg = "";
|
|
|
|
|
switch (actionType) {
|
|
|
|
|
case 1:
|
|
|
|
|
msg = "普通入账产品";
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
msg = "预验收产品";
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
msg = "寄售产品";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
String msg2 = "";
|
|
|
|
|
switch (purType) {
|
|
|
|
|
case 1:
|
|
|
|
|
msg2 = "普通入账产品";
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
msg2 = "预验收产品";
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
msg2 = "寄售产品";
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.error(500, "单据只允许录入" + msg +",当前录入产品为"+msg2+",请检查后重试!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String orderId = addOrderRequest.getBillNo();
|
|
|
|
|
|
|
|
|
|
//三期校验
|
|
|
|
|