获取物料编码

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/MaterialinventoryServiceImpl.java

@@ -105,6 +105,14 @@ public class MaterialinventoryServiceImpl extends ServiceImpl<MaterialinventoryM
                 pojo.setMatname(data.get("matname"));
                 pojo.setMatnum(data.get("matnum"));
                 pojo.setDatasourcecreatetime(data.get("datasourcecreatetime"));
+                pojo.setSuppliercode(data.get("suppliercode"));
+                pojo.setSuppliername(data.get("suppliername"));
+                pojo.setDatasource("0");
+                pojo.setPurchaserhqcode(data.get("purchaserhqcode"));
+                pojo.setRemark(data.get("remark"));
+                pojo.setOpenid(data.get("purchaserhqcode"));
+                pojo.setOwnerid(data.get("suppliercode"));
+                pojo.setMatunit(data.get("matunit"));
                 pojolist.add(pojo);
                 //添加到国网
                 String rs = materialinventoryApi.add(data);
@@ -149,7 +157,7 @@ public class MaterialinventoryServiceImpl extends ServiceImpl<MaterialinventoryM
         String fmaterialid = data.get("matcode");
         //通过物料编码来确认是否是重点原材料
         List<Map<String, String>> select = materialWebapi.select(new HashMap<String,String>(){{
-            put("FMATERIALID",fmaterialid);
+            put("FNumber",fmaterialid);
             put("F_LQKJ_IsImportent","1");
         }}, null);
         //如果是重点原材料就添加到国网
@@ -161,6 +169,13 @@ public class MaterialinventoryServiceImpl extends ServiceImpl<MaterialinventoryM
             pojo.setMatname(data.get("matname"));
             pojo.setMatnum(data.get("matnum"));
             pojo.setDatasourcecreatetime(data.get("datasourcecreatetime"));
+            pojo.setSuppliercode(data.get("suppliercode"));
+            pojo.setSuppliername(data.get("suppliername"));
+            pojo.setDatasource("0");
+            pojo.setPurchaserhqcode(data.get("purchaserhqcode"));
+            pojo.setRemark(data.get("remark"));
+            pojo.setOpenid(data.get("purchaserhqcode"));
+            pojo.setOwnerid(data.get("suppliercode"));
             //添加到国网
             String rs = materialinventoryApi.add(data);
             //将返回信息封装成JSON

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/ProductInventoryServiceImpl.java

@@ -101,6 +101,8 @@ public class ProductInventoryServiceImpl extends ServiceImpl<ProductInventoryMap
                 pojo.setProductcode(data.get("productcode"));
                 pojo.setProductname(data.get("productname"));
                 pojo.setDatasourcecreatetime(data.get("datasourcecreatetime"));
+                pojo.setDatasource("0");
+                pojo.setProductunit(data.get("productunit"));
                 pojolist.add(pojo);
                 //添加到国网
                 String rs = productInventoryApi.add(data);
@@ -141,7 +143,7 @@ public class ProductInventoryServiceImpl extends ServiceImpl<ProductInventoryMap
         String fmaterialid = data.get("productcode");
         //通过物料编码来确认是否是产成品
         List<Map<String, String>> select = materialWebapi.select(new HashMap<String,String>(){{
-            put("FMATERIALID",fmaterialid);
+            put("FNumber",fmaterialid);
             put("F_LQKJ_IsProduct","1");//F_LQKJ_IsProduct
         }}, null);
         //如果是产出品就添加到国网
@@ -152,7 +154,8 @@ public class ProductInventoryServiceImpl extends ServiceImpl<ProductInventoryMap
             pojo.setProductcode(data.get("productcode"));
             pojo.setProductname(data.get("productname"));
             pojo.setDatasourcecreatetime(data.get("datasourcecreatetime"));
-
+            pojo.setDatasource("0");
+            pojo.setProductunit(data.get("productunit"));
             //添加到国网
             String rs = productInventoryApi.add(data);
             JSONObject jsonObject = JSONObject.fromObject(rs);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/ReserveStockServiceImpl.java

@@ -103,6 +103,9 @@ public class ReserveStockServiceImpl extends ServiceImpl<ReserveStrockMapper, Re
                 pojo.setProductamount(data.get("productamount"));
                 pojo.setProductdec(data.get("productdec"));
                 pojo.setDatasourcecreatetime(data.get("datasourcecreatetime"));
+                pojo.setRemark(data.get("productunit"));
+                pojo.setProductunit(data.get("remark"));
+                pojo.setDatasource("0");
                 pojolist.add(pojo);
 
                 //添加到国网
@@ -144,7 +147,7 @@ public class ReserveStockServiceImpl extends ServiceImpl<ReserveStrockMapper, Re
         String fmaterialid = data.get("spareproductcode");
         //通过物料编码来确认是否是备品
         List<Map<String, String>> select = materialWebapi.select(new HashMap<String,String>(){{
-            put("FMATERIALID",fmaterialid);
+            put("FNumber",fmaterialid);
             put("F_LQKJ_IsBackup","1");
         }}, null);
         //如果是备品就添加到国网
@@ -156,7 +159,9 @@ public class ReserveStockServiceImpl extends ServiceImpl<ReserveStrockMapper, Re
             pojo.setProductamount(data.get("productamount"));
             pojo.setProductdec(data.get("productdec"));
             pojo.setDatasourcecreatetime(data.get("datasourcecreatetime"));
-
+            pojo.setRemark(data.get("productunit"));
+            pojo.setProductunit(data.get("remark"));
+            pojo.setDatasource("0");
             //添加到国网
             String rs = reserveStockApi.add(data);
             JSONObject jsonObject = JSONObject.fromObject(rs);

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

@@ -28,6 +28,11 @@ public class MaterialinventoryWebapi implements web_api {
         key.put("FMaterialName","FMaterialName");//物料名称
         key.put("FDate","FDate");//日期
         key.put("FID","FID");//主键
+        key.put("FSupplierId.Fnumber","FSupplierId.Fnumber");//供应商编码
+        key.put("FSupplierId.Fname","FSupplierId.Fname");//供应商名字
+        key.put("FNote","FNote");//备注
+        key.put("FPurchaseOrgId.FNumber","FPurchaseOrgId.FNumber");//采购编码
+        key.put("FBaseUnitID.FNumber","FBaseUnitID.FNumber");//基本单位
     }
     @Override
     public String add(Object object) {
@@ -76,6 +81,11 @@ public class MaterialinventoryWebapi implements web_api {
             salesordermap.put("matname",list1.get(3).toString());
             salesordermap.put("datasourcecreatetime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             salesordermap.put("fid",list1.get(5).toString());
+            salesordermap.put("suppliercode",list1.get(6).toString());
+            salesordermap.put("suppliername",list1.get(7).toString());
+            salesordermap.put("remark",list1.get(8).toString());
+            salesordermap.put("purchaserhqcode",list1.get(9).toString());
+            salesordermap.put("matunit",list1.get(10).toString());
             salesorderlist.add(salesordermap);
         }
         return salesorderlist;

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

@@ -31,11 +31,11 @@ public class ProductInventoryWebapi implements web_api {
         //FSecQty
         key.put("FBaseQty","FBaseQty");//库存量
         key.put("FMATERIALID.Fnumber","FMATERIALID.Fnumber");//物料编码
-        //FMaterialName
         key.put("FMaterialName","FMaterialName");//物料名称
         key.put("FPRODUCEDATE","FPRODUCEDATE");//生产时间
         key.put("FUpdateTime","FUpdateTime");//最后入库时间
         key.put("FID","FID");//主键
+        key.put("FBaseUnitId.FNumber","FBaseUnitId.FNumber");//基本单位
     }
 
     @Override
@@ -101,6 +101,7 @@ public class ProductInventoryWebapi implements web_api {
             salesordermap.put("productname",list1.get(3).toString());
             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());
             salesorderlist.add(salesordermap);
         }
         return salesorderlist;

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

@@ -25,13 +25,14 @@ public class ReserveStockWebapi implements web_api {
 
     public ReserveStockWebapi() {
         /*查询字段*/
-        key.put("FMaterialId", "FMaterialId");//物料编码
-        //FMaterialName
+        key.put("FMaterialId.FNumber", "FMaterialId.FNumber");//物料编码
         key.put("FMaterialName", "FMaterialName");//物料名称
         key.put("FRealQty", "FRealQty");//实收数量
         key.put("FCreateDate", "FCreateDate");//创建时间
         key.put("FBillNo", "FBillNo");//单据编号
         key.put("FID", "FID");//主键
+        key.put("FBaseUnitId.FNumer", "FBaseUnitId.FNumer");//基本单位
+        key.put("FMemo", "FMemo");//备注
     }
 
     @Override
@@ -103,6 +104,8 @@ public class ReserveStockWebapi implements web_api {
             salesordermap.put("datasourcecreatetime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             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());
             salesorderlist.add(salesordermap);
         }
         return salesorderlist;