3.1.7:

PDA成品入库：合并的条码逻辑完善

hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java

@@ -164,6 +164,6 @@ public interface RemoteMesService {
      * @param source      请求来源
      * @return 结果
      */
-    @GetMapping("/barcode/selectBindBarcodeListByBarcodeInfo/{barcodeId}")
+    @GetMapping("/barcode/selectBindBarcodeListByBarcodeInfo/{barcodeInfo}")
     public R<List<MesBaseBindBarcode>> selectBindBarcodeListByBarcodeInfo(@PathVariable("barcodeInfo") String barcodeInfo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesBaseBarcodeInfoController.java

@@ -409,4 +409,5 @@ public class MesBaseBarcodeInfoController extends BaseController
         queryBindBarcode.setBarcodeInfo(barcodeInfo);
         return R.ok(mesBaseBarcodeInfoService.selectMesBaseBindBarcodeList(queryBindBarcode));
     }
+
 }