1

yangle

2023-06-19 8b2b716130c13264c2138cbd0d9cd44e0fca524a

1

 WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs

@@ -556,6 +556,7 @@
                var model = sMainSub["model"].ToString();
                var entry = sMainSub["model"]["HENTRY"].ToString();

                LogService.Write("收料通知单同步 sMainSub:" + sMainSub);
                model = "[" + model.ToString() + "]";
                List<ClsCg_POInStockBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POInStockBillMain>>(model);
                List<ClsCg_POInStockBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POInStockBillSub>>(entry);
@@ -613,6 +614,8 @@
            }
            catch (Exception e)
            {
                LogService.Write("收料通知单同步异常:" + e.ToString());

                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/Sc_JIT_ComplementGoodBillController.cs

@@ -21,6 +21,7 @@
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        #region æ—¥è®¡åˆ’平台基础资料 è½¦é—´ä»“库对照

@@ -419,6 +420,8 @@

        public json AddPODBillSub(string msg3)
        {
            string Ret = "";
            oSystemParameter.ShowBill(ref Ret);
            omodelPODsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Cg_PODemandPlanConfigBillSub>>(msg3);

            foreach (Models.Cg_PODemandPlanConfigBillSub oSub in omodelPODsub)
@@ -447,21 +450,25 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oSub.HLeadTime_Sec == 0 || oSub.HLeadTime_Sec == null)

                if (oSystemParameter.omodel.WMS_CampanyName != "帅威")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = " JIT到货前置期不能为空";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oSub.HDeliveryDaysCtrl == 0 || oSub.HDeliveryDaysCtrl == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = " JIT送货控制天数不能为空";
                    objJsonResult.data = null;
                    return objJsonResult;
                    if (oSub.HLeadTime_Sec == 0 || oSub.HLeadTime_Sec == null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = " JIT到货前置期不能为空";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (oSub.HDeliveryDaysCtrl == 0 || oSub.HDeliveryDaysCtrl == null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = " JIT送货控制天数不能为空";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
            }


 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -686,6 +686,16 @@
                //
                //DataSet ds1 = oCN.RunProcReturn("select * from  h_v_TOERPProcduct_LastProc where HLastProc = '是' and  hbillno='" + BillNo.ToString() + "'", "h_v_TOERPProcduct_LastProc");
                DataSet ds1 = oCN.RunProcReturn("exec h_p_TOERPProcduct_LastProc '" + BillNo + "'", "h_p_TOERPProcduct_LastProc");

                if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未找到对应的本地或金蝶云生产汇报单记录;1.未查询到对应的生产汇报单；2.请确保当前工序是末道工序3.汇报单对应的入库数量已满 è¯·åœ¨é‡‘蝶云查看入库记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DataRow dr1 = ds1.Tables[0].Rows[0];
                if (double.Parse(dr1[0].ToString()) <= 0)
                {

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -445,6 +445,7 @@
                var entry = sMainSub["model"]["HENTRY"].ToString();

                model = "[" + model.ToString() + "]";
                LogService.Write("销售订单同步 sMainSub:" + sMainSub);
                List<ClsXs_SeOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillMain>>(model);
                List<ClsXs_SeOrderBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillSub>>(entry);
                string sql = string.Empty;

 WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs

@@ -394,6 +394,7 @@
                var model = sMainSub["model"].ToString();
                var entry = sMainSub["model"]["HENTRY"].ToString();

                LogService.Write("发货通知单同步 sMainSub:" + sMainSub);
                model = "[" + model.ToString() + "]";
                List<ClsXs_SeOutStockBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOutStockBillMain>>(model);
                List<ClsXs_SeOutStockBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOutStockBillSub>>(entry);