发货明细带入品号品名型号及配件申请单管理不要控制随货不可发

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1893,7 +1893,7 @@ public class Order extends Controller {
         orderQuerySQL.addJoinTable(JOINTYPE.inner, "plm_item", "t3", "t2.itemid=t3.itemid and t3.siteid=t2.siteid","skucontrol","outplace");
         orderQuerySQL.setWhere("t1.siteid",siteid);
         orderQuerySQL.setWhere("t1.sa_orderid",sa_orderids);
-        orderQuerySQL.setWhere("t1.status='审核' and t1.type='配件订单' and t2.undeliqty>0 and ifnull(t2.delivery,'')!='' and t2.isclose=0 and t2.delivery!='随货'");
+        orderQuerySQL.setWhere("t1.status='审核' and t1.type='配件订单' and t2.undeliqty>0 and ifnull(t2.delivery,'')!='' and t2.isclose=0");
         Rows orderRows =orderQuerySQL.query();
 
         QuerySQL orderQuerySQL_jundge = SQLFactory.createQuerySQL(this, "sa_order","sa_orderid","status","sonum","type","delivery");
@@ -1953,16 +1953,17 @@ public class Order extends Controller {
                 errRow.put("delivery",row.getString("delivery"));
                 errRow.put("errreason","行号"+row.getString("rowno")+"的商品发货方式为空,不可发货");
                 errRows.add(errRow);
-            }else if(row.getString("delivery").equals("随货")){
-                errRow.put("sa_orderid",row.getLong("sa_orderid"));
-                errRow.put("sonum",row.getString("sonum"));
-                errRow.put("agentnum",row.getString("agentnum"));
-                errRow.put("status",row.getString("status"));
-                errRow.put("abbreviation",row.getString("abbreviation"));
-                errRow.put("delivery",row.getString("delivery"));
-                errRow.put("errreason","行号"+row.getString("rowno")+"的商品发货方式为随货,不可发货");
-                errRows.add(errRow);
             }
+//            else if(row.getString("delivery").equals("随货")){
+//                errRow.put("sa_orderid",row.getLong("sa_orderid"));
+//                errRow.put("sonum",row.getString("sonum"));
+//                errRow.put("agentnum",row.getString("agentnum"));
+//                errRow.put("status",row.getString("status"));
+//                errRow.put("abbreviation",row.getString("abbreviation"));
+//                errRow.put("delivery",row.getString("delivery"));
+//                errRow.put("errreason","行号"+row.getString("rowno")+"的商品发货方式为随货,不可发货");
+//                errRows.add(errRow);
+//            }
         }
 
 

src/custom/restcontroller/webmanage/sale/sendplan/SQL/销售出库单明细新增.sql

@@ -1,4 +1,4 @@
-insert into st_stockbill_items (siteid, st_stockbill_itemsid,st_stockbillid, sa_dispatch_itemsid, rowno, itemid, qty,amount,remarks,price,sa_orderitemsid,sa_orderid,defaultprice,stockid,custamount)
+insert into st_stockbill_items (siteid, st_stockbill_itemsid,st_stockbillid, sa_dispatch_itemsid, rowno, itemid, qty,amount,remarks,price,sa_orderitemsid,sa_orderid,defaultprice,stockid,custamount,itemno,itemname,model)
 select $siteid$,
        $st_stockbill_itemsid$,
        $st_stockbillid$,
@@ -13,4 +13,7 @@ select $siteid$,
        $sa_orderid$,
        $defaultprice$,
        $stockid$,
-       $custamount$
+       $custamount$,
+       $itemno$,
+       $itemname$,
+       $model$

src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -337,7 +337,7 @@ public class sendplandetail extends Controller {
                 .entrySet().iterator();
 
         ArrayList<Long> st_stockbillids = new ArrayList<Long>();
-
+        RowsMap itemRowsMap = SQLFactory.createQuerySQL(this, "plm_item", "*").setTableAlias("t1").addJoinTable(JOINTYPE.left, "st_stock", "t2", "t1.siteid = t2.siteid and t1.stockno = t2.stockno","stockid").setWhere("itemid", orderdetails.toArrayList("itemid")).query().toRowsMap("itemid");
         while (iter.hasNext()) {
             Map.Entry entry = (Map.Entry) iter.next();
             String sys_enterpriseid = (String) entry.getKey();
@@ -425,6 +425,10 @@ public class sendplandetail extends Controller {
                         sqlFactorydetail.addParameter("custamount", 0);
                     }
                     sqlFactorydetail.addParameter("itemid", jsonObject.getLongValue("itemid"));
+                    sqlFactorydetail.addParameter("itemname", itemRowsMap.containsKey(jsonObject.getStringValue("itemid"))?itemRowsMap.get(jsonObject.getStringValue("itemid")).get(0).getString("itemname"):jsonObject.getStringValue("itemname"));
+                    sqlFactorydetail.addParameter("itemno", itemRowsMap.containsKey(jsonObject.getStringValue("itemid"))?itemRowsMap.get(jsonObject.getStringValue("itemid")).get(0).getString("itemno"):jsonObject.getStringValue("itemno"));
+                    sqlFactorydetail.addParameter("model", itemRowsMap.containsKey(jsonObject.getStringValue("itemid"))?itemRowsMap.get(jsonObject.getStringValue("itemid")).get(0).getString("model"):jsonObject.getStringValue("model"));
+
                     sqlFactorydetail.addParameter("qty", qty);
                     sqlFactorydetail.addParameter("sa_dispatch_itemsid", 0);
                     sqlFactorydetail.addParameter("rowno", rowno);