调拨单优化

src/custom/beans/enterprise_stockbill/bills/BasicBill.java

@@ -146,7 +146,7 @@ public abstract class BasicBill {
             if (itemskuRowsMap.get(sku).get(0).getLong("sys_enterpriseid") != sys_enterpriseid) {
                 throw new YosException("序列号【" + sku + "】非当前经销商所属");
             }
-            if (isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("stockid") != 0) {
+            if (isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("stockid") != 0 && itemskuRowsMap.get(sku).get(0).getLong("stockid") != getAgentStockID()) {
                 throw new YosException("序列号【" + sku + "】总部未出库，无法录入！");
             }
             if (isInStock(ischeck) && itemskuRowsMap.get(sku).get(0).getLong("sys_enterprise_stockid") != 0) {

src/custom/restcontroller/crm/agent/stock/skudbapply.java

@@ -43,7 +43,7 @@ public class skudbapply extends Controller {
         long sys_enterpriseid_in = content.getLongValue("sys_enterpriseid_in");// 申请调入企业ID
         String sku = content.getStringValue("sku");// 申请调拨序列号
         String remarks = content.getStringValue("remarks");// 备注
-        boolean autosubmit = content.getBooleanValue("autosubmit");
+        boolean autosubmit = content.getBooleanValue("autosubmit", true);
         Rows skuRows = SQLFactory.createQuerySQL(this, "sa_itemsku", "sys_enterpriseid", "sys_enterprise_stockid").setSiteid(siteid).setWhere("sku", sku).query();
         if (skuRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("序列号" + sku + "不存在，请检查").toString();

src/custom/restcontroller/crm/manage/stock/skudbapply.java

@@ -29,11 +29,11 @@ public class skudbapply extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t5", "t4.itemid=t5.itemid", "itemno", "itemname", "model", "spec");
         querySQL.setSiteid(siteid);
         if (usertype == 2) {
-            querySQL.setWhere("t1.status in('提交','审核')");
+            querySQL.setWhere("t1.status in('提交','审核','作废')");
             String enterpriseids = Hr.getEnterprise(this, hrid).stream().map(String::valueOf).collect(Collectors.joining(","));
             querySQL.setWhere("t1.sys_enterpriseid_in in(" + enterpriseids + ") or t1.sys_enterpriseid_out in(" + enterpriseids + ")");
         } else {
-            querySQL.setWhere("t1.createflag=1 or t1.status in('提交','审核')");
+            querySQL.setWhere("t1.createflag=1 or t1.status in('提交','审核','作废')");
         }
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
@@ -258,10 +258,12 @@ public class skudbapply extends Controller {
 
         InsertSQL saItemskuChange = SQLFactory.createInsertSQL(this, "sa_itemsku_change");
         saItemskuChange.setSiteid(siteid);
-        saItemskuChange.setValue("sa_agentsid", skuRows.get(0).getLong("sa_agentsid"));
+        saItemskuChange.setValue("sa_agentsid", Enterprise.getAgentsID(this, sys_enterpriseid_out));
         saItemskuChange.setValue("sa_agentsidnew", sa_agentsidnew);
         saItemskuChange.setValue("changenotes", "CRM调拨 单号：" + row.getString("billno"));
         saItemskuChange.setValue("sa_itemskuid", sa_itemskuid);
+        saItemskuChange.setValue("stockidnew", skuRows.get(0).getLong("stockid"));
+        saItemskuChange.setValue("stockid", skuRows.get(0).getLong("stockid"));
         sqlist.add(saItemskuChange);
 
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_sku_dbapply");