Merge branch 'master' of http://119.3.29.177:3000/zhongming/Shengpo

* 'master' of http://119.3.29.177:3000/zhongming/Shengpo:
  调入，生产退料，销售退回发货，退回处理处理

ICS.CreateWCRCV/CustCreateBFRcvSrvSub.cs

@@ -277,6 +277,29 @@ namespace UFIDA.ISV.CreateWCRCVForApi
                         #region 20200615
                         Decimal SupplierConfirmQtyTU = 0;
                         Decimal TotalArriveQtyCU = 0;
+                        string sql = @"SELECT
+                                            a.id
+                                             
+                                            FROM
+                                            PM_PurchaseOrder a
+                                            LEFT JOIN PM_POLine b ON b.PurchaseOrder = a.ID
+                                            
+                                            WHERE
+                                            a.DocNo = '" + rCVhead.srcDocPONo + "' AND b.DocLineNo='" + line.srcDocPOLineNo + "'   ";
+                        DataTable POShip = DBhlper.Query(sql, Appconfig.GetU9ConnStr());
+                        if (POShip != null && POShip.Rows.Count > 0)
+                        {
+
+                        }
+                        else
+                        {
+                            rtnRcvInfo rtnpo = new rtnRcvInfo();
+                            rtnpo.IsSuccess = false;
+                            rtnpo.Message = "采购订单:" + rCVhead.srcDocPONo + ",行:" + line.srcDocPOLineNo + ",不存在！";
+                            rtnpos.Add(rtnpo);
+                            return rtnpos;
+                        }
+                        
                         string sqlShip = @"SELECT
                                             c.SubLineNo,
                                             c.ItemInfo_ItemCode,
@@ -470,7 +493,7 @@ namespace UFIDA.ISV.CreateWCRCVForApi
                         {
                             rtnRcvInfo rtnpo = new rtnRcvInfo();
                             rtnpo.IsSuccess = false;
-                            rtnpo.Message = "采购订单:" + rCVhead.srcDocPONo + ",行:" + line.srcDocPOLineNo + ",已全部入库！";
+                            rtnpo.Message = "采购订单:" + rCVhead.srcDocPONo + ",行:" + line.srcDocPOLineNo + ",不存在或者已全部入库！";
                             rtnpos.Add(rtnpo);
                             return rtnpos;
                         }

UFIDA.U9.CreateSupplier/CustCreateSupplier.cs

@@ -122,7 +122,7 @@ namespace UFIDA.U9.CreateSupplier
 
                     UFIDAU9BasePropertyTypesEffectiveData m_effective = new UFIDAU9BasePropertyTypesEffectiveData();
                     //m_effective.m_effectiveDate = new DateTime(2022, 9, 1);
-                    m_effective.m_effectiveDate = DateTime.Now.AddDays(-1);
+                    m_effective.m_effectiveDate = Convert.ToDateTime(Supp.Effective_EffectiveDate);// DateTime.Now.AddDays(-1);
                     
                     m_effective.m_disableDate = new DateTime(9999, 12, 31);
                     m_effective.m_isEffective = true;