Merge branch 'test-temp-wj-250117-pack' into dev

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java

@@ -29,6 +29,6 @@ public interface IMesProduceSnPrintService {
     @ApiOperation(value = "打印队列查询")
     List<MesPrintQueue> findMesPrintQueueList(MesPrintQueue printQueue);
 
-    @ApiOperation(value = "根据包装条码或者零件条码补打印包装条码")
-    MesProduceSnPrintModel doRePrintPackByPackageNoOrProductSn(MesProduceSnPrintModel mesProduceSnPrintModel);
+    @ApiOperation(value = "根据包装条码补打印包装条码标签")
+    MesProduceSnPrintModel doRePrintPackByPackageNo(MesProduceSnPrintModel mesProduceSnPrintModel);
 }

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

@@ -173,13 +173,13 @@ public class MesProduceSnPrintController {
     }
 
     @PostMapping("/by-packageno/reprint-pack")
-    @ApiOperation(value = "根据包装条码或者零件条码补打印包装条码")
-    public ResultBean doRePrintPackByPackageNoOrProductSn(@RequestBody MesProduceSnPrintModel mesProduceSnPrintModel) {
+    @ApiOperation(value = "根据包装条码补打印包装条码标签")
+    public ResultBean doRePrintPackByPackageNo(@RequestBody MesProduceSnPrintModel mesProduceSnPrintModel) {
         try {
             ValidatorBean.checkNotNull(mesProduceSnPrintModel.getPackageNo(), "包装条码不能为空");
             ValidatorBean.checkNotNull(mesProduceSnPrintModel.getOrganizeCode(), "工厂代码不能为空");
             ValidatorBean.checkNotNull(mesProduceSnPrintModel.getUserName(), "操作人不能为空");
-            return ResultBean.success("查询成功").setResultObject(mesProduceSnPrintService.doRePrintPackByPackageNoOrProductSn(mesProduceSnPrintModel));
+            return ResultBean.success("查询成功").setResultObject(mesProduceSnPrintService.doRePrintPackByPackageNo(mesProduceSnPrintModel));
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java

@@ -503,7 +503,7 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
     }
 
     @Override
-    public MesProduceSnPrintModel doRePrintPackByPackageNoOrProductSn(MesProduceSnPrintModel mesProduceSnPrintModel) {
+    public MesProduceSnPrintModel doRePrintPackByPackageNo(MesProduceSnPrintModel mesProduceSnPrintModel) {
         //根据包装条码查询包装信息
         MesPackage packageDb = packageExtService.getPackageDb(mesProduceSnPrintModel.getOrganizeCode(), mesProduceSnPrintModel.getPackageNo());
         if (null == packageDb) MesPcnException.throwBusiException("包装条码[%s]信息不存在!", mesProduceSnPrintModel.getPackageNo());