1

cjs

1 天以前 ff48949f706e899725c1ef7d0426c12c2b3e674f

 ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs

@@ -453,10 +453,8 @@
                        var req = JsonConvert.DeserializeObject<mesInfo>(res);
                        if(req != null)
                        {
                            if (req.isSucess)
                            if (req.isSuccess)
                            {
                                var mesCodeLen = req.data.mesCode.Length;
                                var mesCodeTwo = int.Parse(req.data.mesCode.Substring(0, mesCodeLen - 3));
                                var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("packingMachineNumber", models.machineNo), "TimeCuoInfoCom");
                                if (timeCuo == null)
                                {
@@ -471,7 +469,7 @@
                                        productModel = req.data.materialSpec,
                                        bagNumber_1 = req.data.bagNum,
                                        totalCount = 1,
                                        timeStamp = mesCodeTwo,
                                        timeStampMES = req.data.mesCode,
                                        photoURL = req.data.barCode,
                                        ProductionDate = req.data.ywDate,
                                        // ERP变更-照相机新增字段
@@ -497,7 +495,7 @@
                                    //变更注释
                                    UpdateBuilder update = Update.Set("isFold", 1).Set("packingMachineNumber", models.machineNo).Set("needWeight", (int)req.data.FMustQty)
                                        .Set("realWeight", (int)req.data.FMustQty).Set("totalWeight", (int)req.data.FMustQty).Set("batchNumber", req.data.Flot)
                                        .Set("productModel", req.data.materialSpec).Set("bagNumber_1", req.data.bagNum).Set("totalCount", 1).Set("timeStamp", mesCodeTwo)
                                        .Set("productModel", req.data.materialSpec).Set("bagNumber_1", req.data.bagNum).Set("totalCount", 1).Set("timeStampMES", req.data.mesCode)
                                        .Set("photoURL", req.data.barCode).Set("ProductionDate", req.data.ywDate).Set("materialCode", req.data.FMaterialNumber)
                                        .Set("materialName", req.data.materialName).Set("measurementUnit", req.data.FUnit)
                                        .Set("createOrganization", req.data.FPrdOrgNumber).Set("WarehouseCode", req.data.FStockNumber).Set("workshopCode", req.data.FWorkShopNumber)
@@ -508,7 +506,6 @@

                                //生成到接驳平台的任务
                                string traycode = DateTime.Now.ToString("yyyy-MM-dd").Replace("-", "");
                                string timeCuo2 = mesCodeTwo.ToString();
                                var CBInfo = Settings.GetConnectingbitsList().Where(a => a.enable == 1).ToList();
                                if (CBInfo != null)
                                {
@@ -529,11 +526,7 @@
                                                    {
                                                        result.success = true;
                                                        CMMLog.Debug($"PDA打包下线：AMS调用API成功！");
                                                        MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", a.locCode), Update.Set("trayCode", traycode).Set("timeCuo", timeCuo2), UpdateFlags.None);

                                                        //上报条码表
                                                        CMMLog.Info($" INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')");
                                                        new SqlHelper<object>().ExecuteSql($" INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')", false);
                                                        MongoDBSingleton.Instance.Update<ConnectingBits>(Query.EQ("Bit", a.locCode), Update.Set("trayCode", traycode).Set("timeCuo", req.data.mesCode), UpdateFlags.None);

                                                        break;
                                                    }
@@ -549,16 +542,29 @@
                                                    result.success = true;
                                                    CMMLog.Debug($"PDA打包下线：AMS调用API成功！");
                                                    //打包下线任务生成成功，向中间表插入数据

                                                    MongoDBSingleton.Instance.Insert<ConnectingBits>(new ConnectingBits { Bit = a.locCode, trayCode = traycode, state = "0", timeCuo = timeCuo2 });

                                                    //上报条码表
                                                    CMMLog.Info($" INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')");
                                                    new SqlHelper<object>().ExecuteSql($" INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')", false);
                                                    MongoDBSingleton.Instance.Insert<ConnectingBits>(new ConnectingBits { Bit = a.locCode, trayCode = traycode, state = "0", timeCuo = req.data.mesCode });

                                                    break;
                                                }
                                                else CMMLog.Debug($"PDA打包下线：AMS调用API失败，开始重新调用！");
                                            }
                                            if (amsResult != null && amsResult.success)
                                            {
                                                //上报条码表
                                                CMMLog.Info($"INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')");
                                                new SqlHelper<object>().ExecuteSql($" INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')", false);
                                                //var plc = Settings.GetPlcInfo().Where(b => b.location == models.machineNo && b.enable == 1).First();
                                                //if(plc != null)
                                                //{
                                                //    var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
                                                //    {
                                                //        addr = plc.writeAddr,
                                                //        host = plc.ip,
                                                //        port = plc.port,
                                                //        data = 4
                                                //    });
                                                //}

                                            }
                                        }
                                        else CMMLog.Debug("打包下线口接驳位点位未配置");
@@ -634,7 +640,7 @@
            public int code { get; set; }
            public string msg { get; set; }
            public mesData data { get; set; }
            public bool isSucess { get; set; }
            public bool isSuccess { get; set; }
        }

        public class mesData