提交

.idea/easycode.ignore

@@ -0,0 +1,13 @@
+node_modules/
+dist/
+vendor/
+cache/
+.*/
+*.min.*
+*.test.*
+*.spec.*
+*.bundle.*
+*.bundle-min.*
+*.*.js
+*.*.ts
+*.log

.idea/git_toolbox_blame.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>

app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java

@@ -44,6 +44,7 @@ public class APIService {
     private static void GetGoodsInfo(){
        String autoKey = ConfigName.getInstance().DeviceAutoKey;
         String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId="+autoKey;
+//        String url = "http://192.168.1.50:5007/api/goods/Getdevicegoods?deviceId=274";
         long curTime = System.currentTimeMillis();
         LogUtils.d(" GetGoodsInfo1 usetime="+(curTime-lastTime));
         lastTime = curTime;
@@ -180,7 +181,7 @@ public class APIService {
                     BPA_GOODPROPERTY bpa_goodproperty = new BPA_GOODPROPERTY();
                     bpa_goodproperty.name = item.goodsAttributeList.get(n).goodsAttributeName;
                     bpa_goodproperty.parentid ="0";
-                    bpa_goodproperty.sort =n+1;
+                    bpa_goodproperty.sort =item.goodsAttributeList.get(n).sort;
                     bpa_goodproperty.id = item.goodsAttributeList.get(n).goodsAttributeId;
                     bpa_goodproperty.userID="超级管理员";
                     bpa_goodproperty.GoodsTypeId=item.goodsTypeId;
@@ -193,7 +194,7 @@ public class APIService {
                             bpa_goodpropertySub.name = item.goodsAttributeList.get(n).goodsAttributeValueList.get(i).attributeValue;
                             bpa_goodpropertySub.parentid = item.goodsAttributeList.get(n).goodsAttributeId;
                             bpa_goodpropertySub.id = item.goodsAttributeList.get(n).goodsAttributeValueList.get(i).goodsAttributeValueId;
-                            bpa_goodpropertySub.sort = i+1;
+                            bpa_goodpropertySub.sort = item.goodsAttributeList.get(n).goodsAttributeValueList.get(i).sort;
                             bpa_goodpropertySub.userID="超级管理员";
                             datas.add(bpa_goodpropertySub);
                         }
@@ -283,7 +284,7 @@ public class APIService {
                             value.forEach(material->{
                                 material.GetFuncModel().OnSource(action->{
                                     FuncModel func=  action.Content.stream().filter(p->p.actionName.equals("主料名称")).findFirst().get();
-                                    BPA_MATERIAL bpaMaterial=  bpaMaterials.stream().filter(p->p.name.equals(func.actionValue)).findFirst().get();
+                                    BPA_MATERIAL bpaMaterial=  bpaMaterials.stream().filter(p->p.name.equals(func.actionValue)).findFirst().get();//todo
                                     FuncModel weight=  action.Content.stream().filter(p->p.actionName.equals("主料重量")).findFirst().get();
                                     FuncModel sort=  action.Content.stream().filter(p->p.actionName.equals("执行步骤")).findFirst().get();
                                     if(bpaMaterial!=null){

app/src/main/java/com/bonait/bnframework/HttpModel/GoodsAttributeList.java

@@ -18,4 +18,6 @@ public class GoodsAttributeList {
      * 商品属性值列表
      */
     public List<GoodsAttributeValueList> goodsAttributeValueList=new ArrayList<>();
+
+    public int sort;
 }

app/src/main/java/com/bonait/bnframework/HttpModel/GoodsAttributeValueList.java

@@ -14,4 +14,6 @@ public class GoodsAttributeValueList {
      */
     public String attributeValue;
 
+    public int sort;
+
 }