VueWebApi/DLL/DAL/AppPurchManagementDAL.cs
@@ -204,7 +204,7 @@
                                hbillno = djwo,
                                hbilltype = "1103", //采购到货单类型
                                hbarcode = json[i].children[j].labcode,
                                qualitystatus= json[i].hischeck=="Y"? "TS" : "CS",
                                qualitystatus = json[i].hischeck == "Y" ? "TS" : "CS",
                                hbarcodestatus = "Y",
                                hbarcodetype = "P",
                                hmaterialcode = json[i].children[j].partnumber,
@@ -479,7 +479,7 @@
                    string labcode = "";//标签信息
                    decimal suminqty = 0; //单标签入库总数量
                    string batchno = ""; //批次号
                    //查询汇总标签信息
                    for (int j = 0; j < arra[i]["labcont"].Count(); j++)//循环获取标签信息
                    {
@@ -508,10 +508,33 @@
                                hinqty = decimal.Parse(arra[i]["labcont"][j]["qty"].ToString())
                            }
                        });
                        labcode = labcode + arra[i]["labcont"][j]["labcode"].ToString() + ",";
                        //写入库存表
                        sql = @"insert into TK_WMS_Stock(labcode,materiel_code,batchno,storehouse_code,location_code,customercode,qty,lm_user,lm_date)
                                values(@labcode,materiel_code,batchno,storehouse_code,location_code,customercode,qty,lm_user,lm_date)";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                labcode = arra[i]["labcont"][j]["labcode"].ToString(),
                                materiel_code = arra[i]["partcode"].ToString(),
                                batchno = batchno,
                                storehouse_code = arra[i]["storehousecode"].ToString(),
                                location_code = arra[i]["warehousecode"].ToString(),
                                customercode = arra[i]["customercode"].ToString(),
                                qty = suminqty,
                                lm_user = username,
                                lm_date = datetime,
                            }
                        });
                        //labcode = labcode + arra[i]["labcont"][j]["labcode"].ToString() + ",";
                        suminqty = suminqty + decimal.Parse(arra[i]["labcont"][j]["qty"].ToString());
                        partlabqty = partlabqty + decimal.Parse(arra[i]["labcont"][j]["qty"].ToString());
                        batchno = arra[i]["labcont"][j]["batch"].ToString();
                    }
                    //更新采购订单子表入库数量
@@ -529,9 +552,9 @@
                    });
                    //写入采购入库单子表
                    sql = @"insert into  TK_WMS_Inwh_Sub(hbillno,labcode,rownumber,materiel_code,storehouse_code,location_code,qty,batchno)
                                values(@hbillno,@labcode,@rownumber,@materiel_code,@storehouse_code,@location_code,@qty,@batchno)";
                    labcode = string.Format("'{0}'", labcode.Substring(0, labcode.Length - 1).Replace(",", "','"));
                    sql = @"insert into  TK_WMS_Inwh_Sub(hbillno,rownumber,materiel_code,storehouse_code,location_code,qty,batchno)
                                values(@hbillno,@rownumber,@materiel_code,@storehouse_code,@location_code,@qty,@batchno)";
                    //labcode = string.Format("'{0}'", labcode.Substring(0, labcode.Length - 1).Replace(",", "','"));
                    list.Add(new
                    {
                        str = sql,
@@ -547,44 +570,7 @@
                            batchno = batchno
                        }
                    });
                    //写入库存表前查询当前物料在库存表中是否存在,写入或更新库存表
                    sql = @"select *  from TK_WMS_Stock where materiel_code=@materiel_code";
                    dynamicParams.Add("@materiel_code", arra[i]["partcode"].ToString());
                    var data1 = DapperHelper.selectdata(sql, dynamicParams);
                    if (data1.Rows.Count > 0)
                    {
                        sql = @"update TK_WMS_Stock set qty=qty+@suminqty
                                where materiel_code=@materiel_code";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                materiel_code = arra[i]["partcode"].ToString(),
                                suminqty = suminqty
                            }
                        });
                    }
                    else
                    {
                        sql = @"insert into TK_WMS_Stock(materiel_code,batchno,storehouse_code,location_code,customercode,qty,lm_user,lm_date)
                                values(materiel_code,batchno,storehouse_code,location_code,customercode,qty,lm_user,lm_date)";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                materiel_code = arra[i]["partcode"].ToString(),
                                batchno = batchno,
                                storehouse_code= arra[i]["storehousecode"].ToString(),
                                location_code= arra[i]["warehousecode"].ToString(),
                                customercode= arra[i]["customercode"].ToString(),
                                qty= suminqty,
                                lm_user=username,
                                lm_date= datetime,
                            }
                        });
                    }
                    /*写入ERP采购入库单************
                     * ***********************
                     * **********************
@@ -800,15 +786,15 @@
                    str = sql,
                    parm = new
                    {
                        orderdate= datetime,
                        ordercode= djwo,
                        status="NEW",
                        departmentcode= arra[0]["departmentcode"].ToString(),
                        customercode= arra[0]["customercode"].ToString(),
                        saleorderid= orderid,
                        saleordercode=ordercode,
                        lm_user= username,
                        lm_date= datetime
                        orderdate = datetime,
                        ordercode = djwo,
                        status = "NEW",
                        departmentcode = arra[0]["departmentcode"].ToString(),
                        customercode = arra[0]["customercode"].ToString(),
                        saleorderid = orderid,
                        saleordercode = ordercode,
                        lm_user = username,
                        lm_date = datetime
                    }
                });
                //根据源单+物料查询采购订单到货总数、入库总数
@@ -843,7 +829,7 @@
                            str = sql,
                            parm = new
                            {
                                hbarcodestatus="N",
                                hbarcodestatus = "N",
                                hsourcebillno = ordercode,
                                hbarcode = arra[i]["labcont"][j]["labcode"].ToString()
                            }
@@ -860,6 +846,21 @@
                                hinqty = decimal.Parse(arra[i]["labcont"][j]["qty"].ToString())
                            }
                        });
                        //更新库存表
                        sql = @"update TK_WMS_Stock set qty=qty-@inqty
                                where materiel_code=@materiel_code and labcode=@labcode";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                labcode = arra[i]["labcont"][j]["labcode"].ToString(),
                                materiel_code = arra[i]["partcode"].ToString(),
                                inqty = decimal.Parse(arra[i]["labcont"][j]["qty"].ToString())
                            }
                        });
                        labcode = labcode + arra[i]["labcont"][j]["labcode"].ToString() + ",";
                        suminqty = suminqty + decimal.Parse(arra[i]["labcont"][j]["qty"].ToString());
                        partlabqty = partlabqty + decimal.Parse(arra[i]["labcont"][j]["qty"].ToString());
@@ -899,24 +900,6 @@
                            batchno = batchno
                        }
                    });
                    //写入库存表前查询当前物料在库存表中是否存在,写入或更新库存表
                    sql = @"select *  from TK_WMS_Stock where materiel_code=@materiel_code";
                    dynamicParams.Add("@materiel_code", arra[i]["partcode"].ToString());
                    var data1 = DapperHelper.selectdata(sql, dynamicParams);
                    if (data1.Rows.Count > 0)
                    {
                        sql = @"update TK_WMS_Stock set qty=qty-@suminqty
                                where materiel_code=@materiel_code";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                materiel_code = arra[i]["partcode"].ToString(),
                                suminqty = suminqty
                            }
                        });
                    }
                    /*写入ERP采购退货单************
                     * ***********************
                     * **********************