66

app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java

@@ -1219,11 +1219,11 @@ public class QueryDB {
      * @param
      * @return
      */
-    public static BPA_GOODSRECIPENAME GetGoodsRecipeNameDesignId(String zfid) {
+    public static BPA_GOODSRECIPENAME GetGoodsRecipeNameDesignId(String zfid,String goodid) {
         try {
             String orderby = Desc_Time_Up;//出料顺序
-            String where = "isDelete=? and design=?";
-            String[] args = new String[]{"0", zfid};
+            String where = "isDelete=? and design=? and goodsID=?";
+            String[] args = new String[]{"0", zfid,goodid};
             ArrayList<BPA_GOODSRECIPENAME> data = new ArrayList<>();
             ArrayList<Object> obj = Get(BPA_GOODSRECIPENAME.class, where, args, orderby);
             for (Object k : obj) {
@@ -2416,7 +2416,7 @@ public class QueryDB {
      * @return
      */
     public static ArrayList<BPA_SUGAR> GetSugarALL() {
-        String orderby = Desc_Time_Up;//先按排序 创建时间倒序
+        String orderby = Desc_Time_Down;//先按排序 创建时间倒序
         String where = "isDelete=?";
         String[] args = new String[]{"0"};
         ArrayList<BPA_SUGAR> data = new ArrayList<>();

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_makegood_control.java

@@ -106,7 +106,7 @@ public class add_makegood_control extends LinearLayout{
         try {
             Good = good;
             makegoodtitle.setText(Good.name + "");
-            chubeiliang.setText(ExecuteTheRecipe.MakeGoodCount +"杯");
+            chubeiliang.setText(ExecuteTheRecipe.MakeGoodCount +"");
             initData();
         } catch (Exception ex) {
 
@@ -189,7 +189,7 @@ public class add_makegood_control extends LinearLayout{
             ggids = ggids.substring(0, ggids.length() - 1);
         }
 
-        goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids);
+        goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids,Good.id);
         if (goodsrecipename == null) {
             ToastUtils.info("没有查询到配方,不能制作!");
             return false;