|
@@ -84,10 +84,12 @@ public class MuseumFlowController {
|
|
|
String number = reviewVO.getNumber();
|
|
|
MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
|
|
|
MuseumFlowDO event = museumFlowService.selectMuseumFlowNumber(number);
|
|
|
+
|
|
|
int Save = result.getSave();
|
|
|
int State = event.getState();
|
|
|
// Save中 0现为未出库或已回库,1为已出库
|
|
|
// State中 0现为未出库或已回库,1为已出库,2为审批中,3为审批通过,4为审批驳回
|
|
|
+ //TODO 你这里上面获取了result和event的值再判断他为空,怎么可能为空 ,所以如果为空的话,上面两句就直接报错了
|
|
|
if (result == null) {
|
|
|
return CommonResult.error(200, "样品不存在");
|
|
|
} else if (event == null) {
|