|
|
|
@ -345,6 +345,18 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
if (CollUtil.isEmpty(orderDetailCodeEntities)) {
|
|
|
|
|
return ResultVOUtils.error(500, "单据还未扫码或和扫码校验存在异常无法提交!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < orderDetailBizEntities.size(); i++) {
|
|
|
|
|
IoOrderDetailBizEntity ioOrderDetailBizEntity = orderDetailBizEntities.get(i);
|
|
|
|
|
if (ioOrderDetailBizEntity.getProductType() == 2) {
|
|
|
|
|
if ( StrUtil.isEmpty(ioOrderDetailBizEntity.getExpireDate()) &&
|
|
|
|
|
StrUtil.isEmpty(ioOrderDetailBizEntity.getBatchNo()) &&
|
|
|
|
|
StrUtil.isEmpty(ioOrderDetailBizEntity.getProductDate()) ){
|
|
|
|
|
return ResultVOUtils.error(500, "单据中存在药品无填写完整三期,无法提交!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 1:必须全部扫齐,才可以通过
|
|
|
|
|
* 2:必须选择了马上放心才能提交
|
|
|
|
|