Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

cnf

2025-05-09 af3455bc13c0ed48f4e3fa1b1614f601df24f12c

Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

 StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs

@@ -74,7 +74,6 @@
            mesDeliveryBarcode.Id = single.Id;
        }


        mesDeliveryBarcode.DeliveryNo = barcode.DeliveryNo;
        mesDeliveryBarcode.ProductCode = barcode.ProductCode;


 StandardInterface/MESApplication/Controllers/SRM/MesDeliveryNoteBarcodeController.cs

@@ -34,11 +34,15 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            PrintBarcode save = m.Save(barcode);
            var save = m.Save(barcode);
            resultInfos = save;

            entity.Result = 1;
            entity.Result = 0;

            if (save) 
            {
                entity.Result = 1;
            }
            entity.DealWith = 1;
            _manager.save(entity);


 StandardInterface/MESApplication/Controllers/WomcaaController.cs

@@ -41,7 +41,10 @@

            entity.Result = 0;

            if (save) entity.Result = 1;
            if (save)
            {
                entity.Result = 1;
            }
            entity.DealWith = 1;
            _manager.save(entity);