u8生成出入库单错误修复

src/custom/restcontroller/webmanage/sale/u8/u8.java

@@ -185,7 +185,10 @@ public class u8 extends Controller {
         Rows u8 = dbConnect.runSqlQuery("select * from u8 where u8id=" + u8id);
         Rows u8billcodes = dbConnect.runSqlQuery("select * from u8billcodes where u8id=" + u8id);
         RowsMap u8billcodesRowsMap = u8billcodes.toRowsMap("itemid");
-        Rows u8bills = dbConnect.runSqlQuery("select t1.*,ifnull(t2.price,0) price,ifnull(t2.taxprice,0) taxprice,t2.taxrate,t3.itemname,t3.itemno,t3.model from (select siteid,itemid,u8id,stockid,rb,sum(qty) qty from u8billcodes group by siteid,itemid,u8id,stockid,rb) t1 left join u8itemprice t2 on t1.u8id=t2.u8id and t1.itemid=t2.itemid and t1.stockid=t2.stockid left join plm_item t3 on t1.itemid=t3.itemid and t1.siteid=t3.siteid  where t1.u8id=" + u8id);
+        Rows u8bills = dbConnect.runSqlQuery("select t1.*,ifnull(t2.price,0) price,ifnull(t2.taxprice,0) taxprice,t2.taxrate, t3.itemname,t3.itemno,t3.model from (\n" +
+                "    select t1.siteid,t1.itemid,t1.u8id,t1.stockid,t1.rb,t2.outplace,sum(t1.qty) qty from u8billcodes t1\n" +
+                "    inner join u8bills t2 on t1.u8id=t2.u8id and t1.billno=t2.billno and t2.typemx!='正品入库' group by t1.siteid,t1.itemid,t1.u8id,t1.stockid,t1.rb,t2.outplace) t1 \n" +
+                "  left join u8itemprice t2 on t1.u8id=t2.u8id and t1.itemid=t2.itemid and t1.stockid=t2.stockid left join plm_item t3 on t1.itemid=t3.itemid and t1.siteid=t3.siteid where t1.u8id=" + u8id);
         RowsMap u8billsRowsMap = u8bills.toRowsMap("rb");
         if (u8.isEmpty()) {
             return getErrReturnObject().setErrMsg("该销售出库U8上传不存在").toString();
@@ -225,6 +228,11 @@ public class u8 extends Controller {
                 insertSQLdetail.setSiteid(siteid);
                 insertSQLdetail.setValue("rowno", i + 1);
                 insertSQLdetail.setValue("st_stockbillid", st_stockbillid);
+                if (row.getString("outplace").equals("谈桥")) {
+                    insertSQLdetail.setValue("stockid", stockRowsMap.containsKey("103") ? stockRowsMap.get("103").get(0).getLong("stockid") : 0);
+                } else {
+                    insertSQLdetail.setValue("stockid", stockRowsMap.containsKey("109") ? stockRowsMap.get("109").get(0).getLong("stockid") : 0);
+                }
                 insertSQLdetail.setValue("itemid", row.getLong("itemid"));
                 insertSQLdetail.setValue("qty", row.getBigDecimal("qty"));
                 insertSQLdetail.setValue("discountrate", 1);
@@ -292,6 +300,11 @@ public class u8 extends Controller {
                 insertSQLdetail.setSiteid(siteid);
                 insertSQLdetail.setValue("rowno", i + 1);
                 insertSQLdetail.setValue("st_stockbillid", st_stockbillid);
+                if (row.getString("outplace").equals("谈桥")) {
+                    insertSQLdetail.setValue("stockid", stockRowsMap.containsKey("103") ? stockRowsMap.get("103").get(0).getLong("stockid") : 0);
+                } else {
+                    insertSQLdetail.setValue("stockid", stockRowsMap.containsKey("109") ? stockRowsMap.get("109").get(0).getLong("stockid") : 0);
+                }
                 insertSQLdetail.setValue("itemid", row.getLong("itemid"));
                 insertSQLdetail.setValue("qty", row.getBigDecimal("qty"));
                 insertSQLdetail.setValue("discountrate", 1);
@@ -358,6 +371,7 @@ public class u8 extends Controller {
                 insertSQLdetail.setSiteid(siteid);
                 insertSQLdetail.setValue("rowno", i + 1);
                 insertSQLdetail.setValue("st_stockbillid", st_stockbillid);
+                insertSQLdetail.setValue("stockid", row.getLong("stockid"));
                 insertSQLdetail.setValue("itemid", row.getLong("itemid"));
                 insertSQLdetail.setValue("qty", row.getBigDecimal("qty"));
                 insertSQLdetail.setValue("discountrate", 1);
@@ -425,6 +439,7 @@ public class u8 extends Controller {
                 insertSQLdetail.setSiteid(siteid);
                 insertSQLdetail.setValue("rowno", i + 1);
                 insertSQLdetail.setValue("st_stockbillid", st_stockbillid);
+                insertSQLdetail.setValue("stockid", row.getLong("stockid"));
                 insertSQLdetail.setValue("itemid", row.getLong("itemid"));
                 insertSQLdetail.setValue("qty", row.getBigDecimal("qty"));
                 insertSQLdetail.setValue("discountrate", 1);