同步为祈禧的代码

啊鑫

2 天以前 eb65436c2312821e3e513ab9ada41dd486d6d7cf

 WebApi/Gs.Ww/WWTBlDJManager.cs

@@ -145,6 +145,44 @@
            dynamic m = new ExpandoObject();
            m.outSum = -1;
            m.outMsg = "";
            // 当审核时（_inFieldValue为"1"时）检查仓库
            if (_inFieldValue == "1")
            {
                try
                {
                    string warehouseCheckSql = @"
                        SELECT COUNT(1) 
                        FROM MES_INV_ITEM_IN_C_DETAILS b 
                        LEFT JOIN MES_INV_ITEM_INS h ON h.GUID = b.ITEM_IN_ID	 
                        LEFT JOIN (
                            SELECT h.ORDER_NO, b1.MATERIAL_CODE, b1.WAREHOUSE, h.ERP_PRODUCTION_ORDER_NO 
                            FROM PRODUCTION_ORDER_SUB b1 
                            LEFT JOIN PRODUCTION_ORDER h ON h.ERP_PRODUCTION_ENTRY_CODE = b1.ERP_PRODUCTION_ENTRY_CODE
                        ) d ON h.work_no = d.ERP_PRODUCTION_ORDER_NO AND d.MATERIAL_CODE = b.item_id 
                        WHERE b.item_in_id = @inFieldValue
                        AND (d.WAREHOUSE IS NULL OR d.WAREHOUSE = '' OR d.WAREHOUSE = '0')";

                    var parameters = new[] {
                        new SqlParameter("@inFieldValue", _guid)
                    };

                    var emptyWarehouseCount = DbHelperSQL.GetSingle(warehouseCheckSql, parameters);

                    if (emptyWarehouseCount != null && Convert.ToInt32(emptyWarehouseCount) > 0)
                    {
                        m.outSum = -1;
                        m.outMsg = "对应的委外单的仓库为空，无法审核！";
                        return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, m.outMsg);
                    }
                }
                catch (Exception ex)
                {
                    LogHelper.Debug(ToString(), "仓库检查失败：" + ex.Message);
                    m.outSum = -1;
                    m.outMsg = "仓库检查失败：" + ex.Message;
                    return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, m.outMsg);
                }
            }
            using (var conn = new SqlConnection(DbHelperSQL.strConn))
            {
                using (var cmd = new SqlCommand("prc_ww_tbldj_Submit", conn))