Merge remote-tracking branch 'origin/master'

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

@@ -31,8 +31,9 @@ public class ReserveStockWebapi implements web_api {
         key.put("FCreateDate", "FCreateDate");//创建时间
         key.put("FBillNo", "FBillNo");//单据编号
         key.put("FID", "FID");//主键
-        key.put("FBaseUnitId.FNumer", "FBaseUnitId.FNumer");//基本单位
-        key.put("FMemo", "FMemo");//备注
+        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,7 +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("remark", list1.get(7).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;

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

@@ -35,9 +35,9 @@ public class SalesOrderWebapi implements web_api {
         key.put("FCreateDate", "FCreateDate");// 来源数据创建时间0
         key.put("FBillNo", "FBillNo");// 销售订单号1
         key.put("FDocumentStatus", "FDocumentStatus");// 销售订单状态2
-        key.put("FMaterialId", "FMaterialId");// 物料编码3
+        key.put("FMaterialId.Fnumber", "FMaterialId.Fnumber");// 物料编码3
         key.put("FMaterialName", "FMaterialName");// 物料名称4
-        key.put("FUnitID", "FUnitID");// 物料单位5
+        key.put("FUnitID.Fnumber", "FUnitID.Fnumber");// 物料单位5
         key.put("FQTY", "FQTY");//物料数量6
         key.put("FID", "FID");//主键7
         key.put("FBillNo","FBillNo ");//单据编号8

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

@@ -26,12 +26,12 @@ public class SupplyListWebapi implements web_api {
         key.put("FBillNo","FBillNo");//单据编码
         key.put("FDocumentStatus","FDocumentStatus");//单据状态
         key.put("FMaterialName","FMaterialName");//物料名字
-        key.put("FMaterialID","FMaterialID");//物料编码
+        key.put("FMaterialID.Fnumber","FMaterialID.Fnumber");//物料编码
 //        key.put("FCustMatID","FCustMatID");//客户物料编码 获取不到对应字段
 //        key.put("FCustMatName","FCustMatName");//客户物料名字
         key.put("FCreateDate","FCreateDate");//创建日期
         key.put("FBaseUnitQty","FBaseUnitQty");//库存基本数量
-        key.put("FUnitID","FUnitID");//库存单位
+        key.put("FUnitID.Fnumber","FUnitID.Fnumber");//库存单位
         key.put("FID","FID");//主键
     }