1

王 垚

2022-10-10 152f3c2a9696e217628c0c857ca229a45d4a891d

1

 WebAPI/Controllers/POInStockController.cs

@@ -651,6 +651,13 @@
                        {
                            foreach (DataRow dr in dt.Rows)
                            {
                                //采购订单下推生成送货单 时候 判断是否有生成采购订单变更单 如果有且变更单状态不为已审核 限制下推
                                objJsonResult = TestPOOrder(dr["FEntryID"].ToString());
                                if (objJsonResult.code == "0")
                                    return objJsonResult;
                            }
                            foreach (DataRow dr in dt.Rows)
                            {
                                if (fidList.Contains(dr["HINTERID"].ToString()))
                                    continue;
                                else
@@ -1257,8 +1264,8 @@
JOIN Gy_Material E ON B.HMaterID = E.HItemID
JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
LEFT join {1}..T_PUR_POCHANGEENTRY D ON C.FENTRYID = D.FOFENTRYID
LEFT join {1}..T_PUR_POCHANGE F ON D.FID = F.FID
where b.HEntryID in ({0})
LEFT join {1}..T_PUR_POCHANGE F ON D.FID = F.FID   
where b.HEntryID in ({0}) 
and F.FDOCUMENTSTATUS <> 'C'"
        , entryids, kdTbaleName);
                ds = oCn.RunProcReturn(sql, "temp");
@@ -1266,7 +1273,28 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据号：" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",物料编码：" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "，有对应采购订单变更单:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "未审核，不能下推送货单！";
                    objJsonResult.Message = "单据号：" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",物料编码：" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "，存在对应采购订单变更单:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "未审核，不能下推送货单！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //采购订单下推生成送货单 时候 判断是否有生成采购订单新变更单 如果有且变更单状态不为已审核 限制下推
                sql = string.Format(@"
select M.HBillNo,B.HMaterID,E.HNumber,E.HName,F.FBILLNO
FROM Cg_POOrderBillSub B  
JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
JOIN Gy_Material E ON B.HMaterID = E.HItemID
JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
LEFT join {1}..t_PUR_XPOOrderENTRY D ON C.FENTRYID = D.FPKIDX
LEFT join {1}..t_PUR_XPOOrder F ON D.FID = F.FID   
where F.FDOCUMENTSTATUS <> 'C' and  b.HEntryID in ({0}) "
        , entryids, kdTbaleName);
                ds = oCn.RunProcReturn(sql, "temp");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据号：" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",物料编码：" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "，存在对应采购订单新变更单:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "未审核，不能下推送货单！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

 WebAPI/bin.7z

Binary files differ