Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

7 天以前 9b6cd6ba2508314b3a4967b3764153170d40e66c

 WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs

@@ -1242,8 +1242,8 @@
                            }
                            else
                            {
                                //鏉＄爜瑙勫垯锛氱墿鏂欏唴鐮丂MTO@鏁伴噺
                                TM = HNumber + "@" + sHMTONo + "@" + sHQty;
                                //鏉＄爜瑙勫垯锛氱墿鏂欏唴鐮丂MTO@鎵规鍙稝鏁伴噺
                                TM = HNumber + "@" + sHMTONo + "@" + HBatchNo + "@" + sHQty;
                            }
                        }