备品单位

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/MaterialinventoryWebapi.java

@@ -86,6 +86,9 @@ public class MaterialinventoryWebapi implements web_api {
             salesordermap.put("remark",list1.get(8).toString());
             salesordermap.put("purchaserhqcode",list1.get(9).toString());
             salesordermap.put("matunit",list1.get(10).toString());
+            salesordermap.put("ownerid",list1.get(6).toString());
+            salesordermap.put("openid",list1.get(9).toString());
+            salesordermap.put("datasource","0");
             salesorderlist.add(salesordermap);
         }
         return salesorderlist;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/ProductInventoryWebapi.java

@@ -102,6 +102,7 @@ public class ProductInventoryWebapi implements web_api {
             salesordermap.put("datasourcecreatetime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             salesordermap.put("fid",list1.get(6).toString());
             salesordermap.put("productunit",list1.get(7).toString());
+            salesordermap.put("datasource","0");
             salesorderlist.add(salesordermap);
         }
         return salesorderlist;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/ReserveStockWebapi.java

@@ -33,6 +33,7 @@ public class ReserveStockWebapi implements web_api {
         key.put("FID", "FID");//主键
         key.put("FBaseUnitId.FNumber", "FBaseUnitId.FNumber");//基本单位
 //        key.put("FMemo", "FMemo");//备注
+        key.put("F_PAEZ_Text", "F_PAEZ_Text");//销售订单号
     }
 
     @Override
@@ -63,7 +64,17 @@ public class ReserveStockWebapi implements web_api {
         }
         return ReserveStock(lists);
     }
-
+    //根据销售订单号查询销售组织的编码以及客户编码
+    public List<Object> select(String number) {
+        List<List<Object>> sal_saleOrder = categoryDao.select("SAL_SaleOrder", new HashMap<String, String>() {{
+            put("FSaleOrgId.FNumber", "FSaleOrgId.FNumber");
+            put("FCustId.Fnumber", "FCustId.Fnumber");
+            put(" FCustId.Fname", " FCustId.Fname");
+        }}, new HashMap<String, String>() {{
+            put("FBillNo", number);
+        }});
+        return sal_saleOrder.get(0);
+    }
     /**
      * 从生产订单获取今天的物料信息
      */
@@ -83,6 +94,8 @@ public class ReserveStockWebapi implements web_api {
 
         return list;
     }
+
+
     public Map<String, List<List<Object>>> synchronization(String where) {
         Map<String, List<List<Object>>> list=null;
         list= categoryDao.selectMapWhere(sFormId, key, where);
@@ -105,11 +118,23 @@ public class ReserveStockWebapi implements web_api {
             salesordermap.put("fbillno", list1.get(4).toString());
             salesordermap.put("fid", list1.get(5).toString());
             salesordermap.put("productunit", list1.get(6).toString());
+            salesordermap.put("datasource", "0");
 //            if("".equals(list1.get(7).toString())){
 //                salesordermap.put("remark", "");
 //            }else {
 //                salesordermap.put("remark", list1.get(7).toString());
 //            }
+//            //如果销售订单不为空则查出销售组织的编码
+//            if(list1.get(7).toString()!=null&&!"".equals(list1.get(7).toString())){
+//                List<Object> select = select(list1.get(7).toString());
+//                salesordermap.put("suppliercode",select.get(0).toString());
+//                salesordermap.put("suppliername",select.get(0).toString());
+//                salesordermap.put("purchaserhqcode",select.get(0).toString());
+//            }else{
+//                salesordermap.put("suppliercode","");
+//                salesordermap.put("suppliername","");
+//                salesordermap.put("purchaserhqcode","");
+//            }
             salesorderlist.add(salesordermap);
         }
         return salesorderlist;