宁德二次装箱防错

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

@@ -82,6 +82,23 @@ public class MesBoxingErrorProofingController {
         }
     }
 
+    @GetMapping("/do-second-scan")
+    @ApiOperation(value = "二次装箱扫描")
+    public ResultBean doSecondScan(MesPackageDetail mesPackageDetail) {
+
+        try {
+            ValidatorBean.checkNotNull(mesPackageDetail.getPackageNo(), "箱条码不能为空");
+
+            mesPackageDetail.setOrganizeCode(!StringUtils.isEmpty(mesPackageDetail.getOrganizeCode())?mesPackageDetail.getOrganizeCode():AuthUtil.getOrganizeCode());
+            ConvertBean.serviceModelInitialize(mesPackageDetail,!StringUtils.isEmpty(mesPackageDetail.getModifyUser())?mesPackageDetail.getModifyUser():AuthUtil.getSessionUser().getUserName());
+            return mesBoxingErrorProofingService.doScan(mesPackageDetail);
+        } catch (ImppBusiException imppException) {
+            return ResultBean.fail(imppException);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 
     @PostMapping("/mes-package-details/saveAll")
     @ApiOperation(value = "保存包装明细")