DM202504230012

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesRawPartChargingController.java

@@ -32,8 +32,7 @@ public class MesRawPartChargingController {
     public ResultBean findMesRawPackagePart(MesRawPartChargingModel mesRawPartChargingModel) {
         try {
             ValidatorBean.checkNotNull(mesRawPartChargingModel.getPackageSn(),"料筒条码不能为空");
-            mesRawPartChargingModel.setUserName(!StringUtils.isEmpty(mesRawPartChargingModel.getUserName())?mesRawPartChargingModel.getUserName():AuthUtil.getSessionUser().getUserName());
-            mesRawPartChargingModel.setOrganizeCode(!StringUtils.isEmpty(mesRawPartChargingModel.getOrganizeCode())?mesRawPartChargingModel.getOrganizeCode():AuthUtil.getOrganizeCode());
+            ValidatorBean.checkNotNull(mesRawPartChargingModel.getOrganizeCode(),"工厂不能为空");
             return ResultBean.success("执行成功").setResultObject(mesRawPartChargingService.findMesRawPackagePart(mesRawPartChargingModel));
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
@@ -47,8 +46,8 @@ public class MesRawPartChargingController {
     public ResultBean doAction(@RequestBody MesRawPartChargingModel mesRawPartChargingModel) {
         try {
             ValidatorBean.checkNotNull(mesRawPartChargingModel.getType(), "操作类型不能为空");
-            mesRawPartChargingModel.setUserName(!StringUtils.isEmpty(mesRawPartChargingModel.getUserName())?mesRawPartChargingModel.getUserName():AuthUtil.getSessionUser().getUserName());
-            mesRawPartChargingModel.setOrganizeCode(!StringUtils.isEmpty(mesRawPartChargingModel.getOrganizeCode())?mesRawPartChargingModel.getOrganizeCode():AuthUtil.getOrganizeCode());
+            ValidatorBean.checkNotNull(mesRawPartChargingModel.getOrganizeCode(), "工厂不能为空");
+            ValidatorBean.checkNotNull(mesRawPartChargingModel.getUserName(), "操作人不能为空");
             return ResultBean.success("执行成功").setResultObject(mesRawPartChargingService.doAction(mesRawPartChargingModel));
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);