Merge branch 'master' of http://8.130.121.29:3000/yuyubo/Pilot_KD_Parino_yuyubo

Pilot_KD_Parino/Pilot_KD_Parino.csproj

@@ -108,9 +108,6 @@
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="IronPython">
-      <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\IronPython.dll</HintPath>
-    </Reference>
     <Reference Include="JWT">
       <HintPath>..\..\..\派诺-裴豪\派诺功能\代码\Pilot_KD_Parino (2)\Pilot_KD_Parino\Pilot_KD_Parino\bin\Debug\JWT.dll</HintPath>
     </Reference>

Pilot_KD_Parino/Sal_Order/PushSaleOutBillPlugIn.cs

@@ -49,6 +49,9 @@ namespace Pilot_KD_Parino.Sal_Order
 
                     var FEntity = this.View.Model.DataObject;
                     BillObj = FEntity;
+                    //var sdsas = JsonHelper.ToJson(BillObj);
+                    //Logger.Error("销售出库单对象", sdsas, new Exception());
+                   
                     var id = FEntity["id"];
                     fid = Convert.ToString(id);
                     string formid = FEntity["FFormId"].ToString();
@@ -147,6 +150,7 @@ namespace Pilot_KD_Parino.Sal_Order
                             result = Invoke("PUR_PurchaseOrder", "PUR_ReceiveBill", tempFid.ToString(), "7cd93c259999489c97798063f2f7bd70", ref stockId,"收料通知单");
                         }
                     }
+                    return;
                     if (result != null)
                     {
                         sheet = result.SuccessDataEnity.FirstOrDefault();
@@ -522,6 +526,7 @@ namespace Pilot_KD_Parino.Sal_Order
                 ////目标单元数据
                 FormMetadata destFormMetadata = ServiceHelper.GetService<IMetaDataService>().Load(this.Context, target) as FormMetadata;
 
+                IOperationResult saveResult2 = BusinessDataServiceHelper.Draft(this.Context, destFormMetadata.BusinessInfo, destObjs, OperateOption.Create());
                 var sdsas = JsonHelper.ToJson(destObjs);
                 Logger.Error("目标单据数据集合", sdsas, new Exception());
                 int temStockId = stockId;
@@ -587,6 +592,7 @@ namespace Pilot_KD_Parino.Sal_Order
                                 if (MaterialCode[code2] != qty)
                                 {
                                     t["ActReceiveQty"] = MaterialCode[code2];
+                                    t["StockQty"] = MaterialCode[code2];
                                 }
                             }
                             else
@@ -597,12 +603,14 @@ namespace Pilot_KD_Parino.Sal_Order
                     });
                     if (deleteItem.Count > 0)
                     {
+                        //Logger.Error("BeforeData",JsonHelper.ToJson(stock0), new Exception());
                         deleteItem.ForEach(t =>
                         {
                             stock0.Remove(t);
                         });
+                        Logger.Error("deleteItem", JsonHelper.ToJson(deleteItem), new Exception());
                     }
-                    IOperationResult saveResult0 = ServiceHelper.GetService<ISaveService>().Save(this.Context, destFormMetadata.BusinessInfo, destObjs, OperateOption.Create());
+                    ServiceHelper.GetService<ISaveService>().Save(this.Context, destFormMetadata.BusinessInfo, destObjs, OperateOption.Create());
                     //调用FActReceiveQty字段值更新服务
                     InvokeFieldUpdate(Convert.ToString(stocks3["Id"]));
 
@@ -740,7 +748,7 @@ namespace Pilot_KD_Parino.Sal_Order
                 //#endregion
 
 
-                IOperationResult saveResult2 = BusinessDataServiceHelper.Draft(this.Context, destFormMetadata.BusinessInfo, destObjs, OperateOption.Create());
+                //IOperationResult saveResult2 = BusinessDataServiceHelper.Draft(this.Context, destFormMetadata.BusinessInfo, destObjs, OperateOption.Create());
                 ////保存目标单据
                 IOperationResult saveResult = ServiceHelper.GetService<ISaveService>().Save(this.Context, destFormMetadata.BusinessInfo, destObjs, OperateOption.Create());
                 ////合并保存操作结果
@@ -815,6 +823,7 @@ namespace Pilot_KD_Parino.Sal_Order
             DynamicFormViewPlugInProxy eventProxy = billView.GetService<DynamicFormViewPlugInProxy>();
             eventProxy.FireOnLoad();
             ModifyBill(billView, FID);
+            
             int Rowcount = billView.Model.GetEntryRowCount("FDetailEntity");
             for (int j = 0; j < Rowcount; j++)
             {

发货通知单的核销记录审核.sql

@@ -6,13 +6,14 @@ ALTER proc UpdateSalOrderAmount2
 as   
 begin   
 
- DECLARE @F_Amount DECIMAL(18,2)=0,@FBILLNO NVARCHAR(50),@saleOrgId INT,@F_Papercontract NVARCHAR(2000)
+ DECLARE @F_Amount DECIMAL(18,2)=0,@FBILLNO NVARCHAR(50),@saleOrgId INT,@F_Papercontract NVARCHAR(2000),@yewu DATETIME
 
    SELECT @F_Amount=ISNULL(SUM(CONVERT(decimal(18,2), FALLAMOUNT2)),0), @FBILLNO=FBILLNO2  FROM VRYF_t_Cust100015 A   
   INNER JOIN  VRYF_t_Cust_Entry100024 B ON A.FID = B.FID   
   WHERE  a.FID =@FID
   GROUP BY   FBILLNO2
- 
+
+
  SELECT @saleOrgId= a.FSALEORGID,@F_Papercontract=F_Papercontract  FROM T_SAL_DELIVERYNOTICE a 
  WHERE a.FBILLNO=@FBILLNO
 
@@ -26,11 +27,15 @@ begin
 
  --<EFBFBD>޸<EFBFBD><EFBFBD>տ<EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
  
-   SELECT @F_Amount=ISNULL(SUM(CONVERT(decimal(18,2), FALLAMOUNT3)),0), @FBILLNO=FBILLNO3  FROM VRYF_t_Cust100015 A   
+   SELECT @F_Amount=ISNULL(SUM(CONVERT(decimal(18,2), FALLAMOUNT3)),0), @FBILLNO=FBILLNO3,@yewu=MAX(FDate3)  FROM VRYF_t_Cust100015 A   
   INNER JOIN  VRYF_t_Cust_Entry100025 B ON A.FID = B.FID   
   WHERE  a.FID =@FID
     GROUP BY   FBILLNO3
 
+	 
+ UPDATE VRYF_t_Cust100015 SET F_YeWuDate=@yewu
+WHERE FID=@fid AND F_YeWuDate IS NULL
+
   UPDATE T_AR_RECEIVEBILL SET F_Amount=ISNULL(F_Amount,0)+@F_Amount ,F_contractnumber=@F_Papercontract   
    WHERE FBILLNO =@FBILLNO  ;