From 8cb86b1d7764254d8731a08b002097baadce81b7 Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Tue, 21 May 2024 19:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E6=96=B9=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=EF=BC=8C=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  4 +-
 .../bnframework/HttpModel/APIService.java     | 33 +++++-----
 .../bnframework/common/constant/DataBus.java  |  4 +-
 .../bonait/bnframework/common/db/QueryDB.java | 51 ++++++++++++++-
 .../common/db/mode/BPA_SUBORDER.java          |  2 +-
 .../bnframework/common/db/res/MakeStatus.java |  1 +
 .../bnframework/common/db/res/SuOrderTJ.java  |  1 +
 .../common/linktab/good/GoodRightAdapter.java | 57 ++++++++++++++---
 .../modules/home/adapter/ddtj_adapter.java    |  4 +-
 .../modules/home/adapter/newgood_adapter.java | 28 +++++----
 .../home/fragment/MakeGoodFragment.java       |  2 -
 .../fragment/from/GoodPeiFangActivity.java    | 63 +++++++++++++------
 .../from/SalesStatisticsActivity.java         |  6 +-
 .../res/layout/activity_salesstatistics.xml   | 17 +++++
 .../res/layout/datatab/layout/ddtj_item.xml   | 18 ++++++
 .../res/layout/item/layout/newgood_bj.xml     |  7 +++
 16 files changed, 228 insertions(+), 70 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 1318f7ef..6ea46308 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-05-21T09:01:34.719952400Z">
+        <DropdownSelection timestamp="2024-05-21T10:18:30.232371300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=127.0.0.1:7555;connection=74bb378d" />
+              <DeviceId pluginId="Default" identifier="serial=192.168.1.12:5555;connection=5c9e2c42" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java
index f99081f7..a0537e93 100644
--- a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java
+++ b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java
@@ -119,38 +119,33 @@ public class APIService {
      * @param goodsAttributeList
      */
     private static void GoodPropSynchronous(String goodsTypeId, List<GoodsAttributeList> goodsAttributeList){
-        goodsAttributeList.forEach(goodProperty->{
+        if(goodsAttributeList==null){
+            return;
+        }
+        for(int n=0;n<goodsAttributeList.size();n++){
             //属性添加
             BPA_GOODPROPERTY bpa_goodproperty = new BPA_GOODPROPERTY();
-            bpa_goodproperty.name = goodProperty.goodsAttributeName;
+            bpa_goodproperty.name = goodsAttributeList.get(n).goodsAttributeName;
             bpa_goodproperty.parentid ="0";
-            bpa_goodproperty.id = goodProperty.goodsAttributeId;
+            bpa_goodproperty.sort =n+1;
+            bpa_goodproperty.id = goodsAttributeList.get(n).goodsAttributeId;
             bpa_goodproperty.userID="超级管理员";
             bpa_goodproperty.GoodsTypeId=goodsTypeId;
             QueryDB.AddGoodsProperty(bpa_goodproperty);
 
             //子属性添加
-            if(goodProperty.goodsAttributeValueList!=null){
-                for(int i=0;i<goodProperty.goodsAttributeValueList.size();i++){
+            if(goodsAttributeList.get(n).goodsAttributeValueList!=null){
+                for(int i=0;i<goodsAttributeList.get(n).goodsAttributeValueList.size();i++){
                     BPA_GOODPROPERTY bpa_goodpropertySub = new BPA_GOODPROPERTY();
-                    bpa_goodpropertySub.name = goodProperty.goodsAttributeValueList.get(i).attributeValue;
-                    bpa_goodpropertySub.parentid = goodProperty.goodsAttributeId;
-                    bpa_goodpropertySub.id = goodProperty.goodsAttributeValueList.get(i).goodsAttributeValueId;
+                    bpa_goodpropertySub.name = goodsAttributeList.get(n).goodsAttributeValueList.get(i).attributeValue;
+                    bpa_goodpropertySub.parentid = goodsAttributeList.get(n).goodsAttributeId;
+                    bpa_goodpropertySub.id = goodsAttributeList.get(n).goodsAttributeValueList.get(i).goodsAttributeValueId;
                     bpa_goodpropertySub.sort = i+1;
                     bpa_goodproperty.userID="超级管理员";
                     QueryDB.AddGoodsProperty(bpa_goodpropertySub);
                 }
             }
-
-//            goodProperty.goodsAttributeValueList.forEach(attributeValue->{
-//                BPA_GOODPROPERTY bpa_goodpropertySub = new BPA_GOODPROPERTY();
-//                bpa_goodpropertySub.name = attributeValue.attributeValue;
-//                bpa_goodpropertySub.parentid = goodProperty.goodsAttributeId;
-//                bpa_goodpropertySub.id = attributeValue.goodsAttributeValueId;
-//                bpa_goodproperty.userID="超级管理员";
-//                QueryDB.AddGoodsProperty(bpa_goodpropertySub);
-//            });
-        }) ;
+        }
     }
 
     /**
@@ -239,11 +234,13 @@ public class APIService {
                             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();
                             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){
                                 BPA_GOODSRECIPE bpa_goodsrecipe = new BPA_GOODSRECIPE();
                                 bpa_goodsrecipe.goodsID = goodinfo.goodsId;
                                 bpa_goodsrecipe.materialID = bpaMaterial.id;
                                 bpa_goodsrecipe.value =weight.actionValue;
+                                bpa_goodsrecipe.sort = Integer.parseInt(sort.actionValue);
                                 bpa_goodsrecipe.recipeID=bpa_goodsrecipename.id;
                                 QueryDB.AddGoodsSrecipe(bpa_goodsrecipe);
                             }
diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java b/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java
index ae170b6e..81645431 100644
--- a/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java
+++ b/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java
@@ -303,10 +303,10 @@ public class DataBus {
             {
                 if(item.subOrder.id.equals(suborderID))
                 {
-                    item.makeStatus=MakeStatus.制作完成;
+                    item.makeStatus=MakeStatus.取消;
                     item.makeMs="";
                     item.makeProcess=100;
-                    item.subOrder.status=2;
+                    item.subOrder.status=4;
                     QueryDB.UpdateSubOrder(item.subOrder);
                     good=item;
                 }
diff --git a/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java b/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java
index a1d22970..f18b359b 100644
--- a/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java
+++ b/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java
@@ -1333,7 +1333,7 @@ public class QueryDB {
      * @param
      * @return
      */
-    public static BPA_GOODSRECIPENAME GetGoodsRecipeNameDesignId(String zfid,String goodid) {
+    public static BPA_GOODSRECIPENAME GetGoodsRecipeNameDesignId2(String zfid,String goodid) {
         try {
             String orderby = Desc_Time_Up;//出料顺序
             String where = "isDelete=? and design=? and goodsID=?";
@@ -1349,6 +1349,55 @@ public class QueryDB {
             return null;
         }
     }
+
+    /**
+     * 做法ID查询配方关联表
+     *
+     * @param
+     * @return
+     */
+    public static BPA_GOODSRECIPENAME GetGoodsRecipeNameDesignId(String zfid,String goodid) {
+        try {
+            boolean exist = false;
+            String orderby = Desc_Time_Up;//出料顺序
+            String where = "isDelete=? and  goodsID=?";
+            String[] args = new String[]{"0",goodid};
+            ArrayList<BPA_GOODSRECIPENAME> data = new ArrayList<>();
+            ArrayList<Object> obj = Get(BPA_GOODSRECIPENAME.class, where, args, orderby);
+            for (Object k : obj) {
+                BPA_GOODSRECIPENAME bean = (BPA_GOODSRECIPENAME) k;
+                if (zfid.isEmpty()) {
+                    if(bean.design == null || bean.design.isEmpty()){
+                        return bean;
+                    }
+                } else if (bean.design.contains(",") && zfid.contains(",")) {
+                    String[] res = bean.design.split(",");
+                    String[] res2 = zfid.split(",");
+                    if (res.length == res2.length) {
+                        boolean xx = true;
+                        for (String s : res) {
+                            if (!zfid.contains(s)) {
+                                xx = false;
+                            }
+                        }
+                        if (xx) {
+                           return bean;
+                        }
+                    }
+                }else{
+                    if(!bean.design.isEmpty()){
+                        if(zfid.equals(bean.design)){
+                            return bean;
+                        }
+                    }
+                }
+            }
+            return null;
+        } catch (Exception e) {
+            Log.d("商品ID查询配方信息", "商品ID查询配方信息异常: " + e.getMessage());
+            return null;
+        }
+    }
     //endregion
 
     //region BPA_GOODSRECIPE 商品配方明细表
diff --git a/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SUBORDER.java b/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SUBORDER.java
index 5627b172..0220d889 100644
--- a/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SUBORDER.java
+++ b/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SUBORDER.java
@@ -13,7 +13,7 @@ public class BPA_SUBORDER extends ModeBase{
     public String recipeID;
     //数量：例如 *1  *2
     public int number;
-    //状态：0 未开始 1 制作中 2 已制作 3 已超时
+    //状态：0 未开始 1 制作中 2 已制作 3 已超时 4 取消
     public int status;
     //商品图片
     public String goodImg;
diff --git a/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java b/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java
index 23d7b798..10ae76c3 100644
--- a/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java
+++ b/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java
@@ -3,5 +3,6 @@ package com.bonait.bnframework.common.db.res;
 public enum MakeStatus {
     等待中,
     制作中,
+    取消,
     制作完成
 }
diff --git a/app/src/main/java/com/bonait/bnframework/common/db/res/SuOrderTJ.java b/app/src/main/java/com/bonait/bnframework/common/db/res/SuOrderTJ.java
index 4e8e18ef..0e119389 100644
--- a/app/src/main/java/com/bonait/bnframework/common/db/res/SuOrderTJ.java
+++ b/app/src/main/java/com/bonait/bnframework/common/db/res/SuOrderTJ.java
@@ -5,4 +5,5 @@ public class SuOrderTJ {
     public int Count;
     public int Yzz_Count;
     public int Yc_Count;
+    public int Cancel_Count;
 }
diff --git a/app/src/main/java/com/bonait/bnframework/common/linktab/good/GoodRightAdapter.java b/app/src/main/java/com/bonait/bnframework/common/linktab/good/GoodRightAdapter.java
index de3e8d5f..0d35b27d 100644
--- a/app/src/main/java/com/bonait/bnframework/common/linktab/good/GoodRightAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/common/linktab/good/GoodRightAdapter.java
@@ -1,6 +1,11 @@
 package com.bonait.bnframework.common.linktab.good;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.res.Resources;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
@@ -10,6 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.linktab.LinkMode;
 import com.bonait.bnframework.common.view.MyLayoutManager;
+import com.bonait.bnframework.modules.home.adapter.AttributeSetAdapter;
 import com.bonait.bnframework.modules.home.adapter.liaochang_adapter;
 import com.bonait.bnframework.modules.home.adapter.newgood_adapter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -18,26 +24,57 @@ import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import java.util.List;
 
 
-public class GoodRightAdapter extends BaseQuickAdapter<LinkMode, BaseViewHolder> {
+public class GoodRightAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     public List<LinkMode> Fdata;
-    public Resources resources;
-    public GoodRightAdapter(@LayoutRes int layoutResId, @Nullable List<LinkMode> data, Resources _resources) {
-        super(layoutResId, data);
-        resources=_resources;
+    private final LayoutInflater mLayoutInflater;
+    private Context context;
+    public GoodRightAdapter(Context context, @Nullable List<LinkMode> data) {
+//        super(layoutResId, data);
         Fdata=data;
+        mLayoutInflater = LayoutInflater.from(context);
+        this.context = context;
     }
 
+//    @Override
+//    protected void convert(BaseViewHolder holder, LinkMode item) {
+//        RecyclerView view= holder.getView(R.id.recycler_view);
+//
+//        MyLayoutManager layout = new MyLayoutManager();
+//        layout.setAutoMeasureEnabled(true);
+//        view.setLayoutManager(layout);
+//        newgood_adapter adapter = new newgood_adapter(getContext(), item.content);
+//        view.setAdapter(adapter);
+//    }
+
+    @NonNull
     @Override
-    protected void convert(BaseViewHolder holder, LinkMode item) {
-        RecyclerView view= holder.getView(R.id.recycler_view);
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View inflate = mLayoutInflater.inflate(R.layout.item_right_lc, parent, false);
+        return new MyLCViewHolder1(inflate);
+
+    }
 
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, @SuppressLint("RecyclerView") int position) {
+        MyLCViewHolder1 myLCViewHolder1 = (MyLCViewHolder1)holder;
         MyLayoutManager layout = new MyLayoutManager();
         layout.setAutoMeasureEnabled(true);
-        view.setLayoutManager(layout);
-        newgood_adapter adapter = new newgood_adapter(getContext(), item.content);
-        view.setAdapter(adapter);
+        myLCViewHolder1.recyclerView.setLayoutManager(layout);
+        newgood_adapter adapter = new newgood_adapter(position,context, Fdata.get(position).content);
+        myLCViewHolder1.recyclerView.setAdapter(adapter);
     }
 
+    @Override
+    public int getItemCount() {
+        return Fdata.size();
+    }
 
+    public static class MyLCViewHolder1 extends RecyclerView.ViewHolder{
+        RecyclerView recyclerView;
+        public MyLCViewHolder1(@NonNull View itemView) {
+            super(itemView);
+            recyclerView= itemView.findViewById(R.id.recycler_view);
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/ddtj_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/ddtj_adapter.java
index 22999e8c..dfc11ad3 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/ddtj_adapter.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/ddtj_adapter.java
@@ -40,15 +40,17 @@ public class ddtj_adapter extends ArrayAdapter<SuOrderTJ> {
         //为每一个子项加载设定的布局
         View view = LayoutInflater.from(getContext()).inflate(this.resource, parent, false);
         //分别获取 image view 和 textview 的实例
-        TextView name,ddzl,ddzl_yzz,ddzl_yc;
+        TextView name,ddzl,ddzl_yzz,ddzl_yc,ddzl_cancel;
         name = (TextView) view.findViewById(R.id.name);
         ddzl = (TextView) view.findViewById(R.id.ddzl);
         ddzl_yzz = (TextView) view.findViewById(R.id.ddzl_yzz);
         ddzl_yc = (TextView) view.findViewById(R.id.ddzl_yc);
+        ddzl_cancel = (TextView) view.findViewById(R.id.ddzl_cancel);
         name.setText(order.name+"");
         ddzl.setText(order.Count+"");
         ddzl_yzz.setText(order.Yzz_Count+"");
         ddzl_yc.setText(order.Yc_Count+"");
+        ddzl_cancel.setText(order.Cancel_Count+"");
         return view;
     }
     private Activity findActivity(@NonNull Context context) {
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/newgood_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/newgood_adapter.java
index 5569317d..45dd7677 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/newgood_adapter.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/newgood_adapter.java
@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -25,6 +26,7 @@ import com.bonait.bnframework.common.db.res.lcMode;
 import com.bonait.bnframework.common.glide.GlideUtil;
 import com.bonait.bnframework.common.image.MyBitmapUtils;
 import com.bonait.bnframework.common.message.MessageManager;
+import com.bonait.bnframework.common.model.mode.GoodsAPositionBean;
 import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
@@ -42,13 +44,15 @@ public class newgood_adapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     //图标
     private MyBitmapUtils myBitmapUtils = new MyBitmapUtils();
+    private int currentPos;//分类位置
 
     public List<Object> Data = new ArrayList<>();
 
-    public newgood_adapter(Context context, List<Object> data) {
+    public newgood_adapter(int position,Context context, List<Object> data) {
         this.context = context;
         mLayoutInflater = LayoutInflater.from(context);
         Data = data;
+        this.currentPos = position;
     }
 
     @Override
@@ -83,6 +87,12 @@ public class newgood_adapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 /**
                  * 图片点击后打开
                  */
+                myViewHolder.Tag_text.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        MessageManager.getInstance().sendMessage(MessageName.ClickGoodNew,goods);
+                    }
+                });
                 myViewHolder.ImageUrl.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
@@ -96,7 +106,7 @@ public class newgood_adapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 myViewHolder.Sc_text.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        MessageManager.getInstance().sendMessage(MessageName.UpdateGood,goods);
+                        MessageManager.getInstance().sendMessage(MessageName.UpdateGood,new GoodsAPositionBean(currentPos,goods));
                     }
                 });
 
@@ -106,16 +116,8 @@ public class newgood_adapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 myViewHolder.delete_text.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        AlertDialogUtils.showDialog(context,
-                                "删除提示！",
-                                "客官确定要删除商品,[" + goods.name + "]吗？",
-                                new QMUIDialogAction.ActionListener() {
-                                    @Override
-                                    public void onClick(QMUIDialog dialog, int index) {
-                                        MessageManager.getInstance().sendMessage(MessageName.DeleteGood1,goods);
-                                        dialog.dismiss();
-                                    }
-                                });
+                        MessageManager.getInstance().sendMessage(MessageName.DeleteGood1,new GoodsAPositionBean(currentPos,goods));
+
                     }
                 });
 
@@ -128,7 +130,7 @@ public class newgood_adapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     /**
      * 删除数据
      *
-     * @param index
+     * @param
      */
     public void Detele(BPA_GOODS goods) {
         QueryDB.DeleteGoods(goods);
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
index 32dbf4f1..9820acd6 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
@@ -75,8 +75,6 @@ import com.bonait.bnframework.common.helper.ThreadManager;
 import com.bonait.bnframework.common.helper.WrapContentLinearLayoutManager;
 import com.bonait.bnframework.common.linktab.LinkMode;
 import com.bonait.bnframework.common.linktab.TopItemDecoration;
-import com.bonait.bnframework.common.linktab.good.GoodLeftAdapter;
-import com.bonait.bnframework.common.linktab.good.GoodRightAdapter;
 import com.bonait.bnframework.common.linktab.makegood.MakeGoodLeftAdapter;
 import com.bonait.bnframework.common.linktab.makegood.MakeGoodRightAdapter;
 import com.bonait.bnframework.common.message.MessageLooper;
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/GoodPeiFangActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/GoodPeiFangActivity.java
index 35e22429..1d27b50b 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/GoodPeiFangActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/GoodPeiFangActivity.java
@@ -18,6 +18,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.RelativeLayout;
 
+import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.base.BaseActivity;
 import com.bonait.bnframework.common.base.BaseFragment;
@@ -51,6 +52,7 @@ import com.bonait.bnframework.common.model.mode.ActionJsonMode;
 import com.bonait.bnframework.common.model.mode.BatchingInfo;
 import com.bonait.bnframework.common.model.mode.BomTechnologyActionInfo;
 import com.bonait.bnframework.common.model.mode.CloudGood;
+import com.bonait.bnframework.common.model.mode.GoodsAPositionBean;
 import com.bonait.bnframework.common.model.mode.GoodsTechnology;
 import com.bonait.bnframework.common.model.mode.TechnologyAction;
 import com.bonait.bnframework.common.model.mode.UpdateBomInfo;
@@ -155,6 +157,7 @@ public class GoodPeiFangActivity extends BaseActivity {
     }
 
 
+    private int typePos = 0;
     private void initTopBar() {
         mTopBar.setTitle("商品配方管理");
         mTopBar.addLeftImageButton(R.mipmap.fanhui, R.id.topbar).setOnClickListener(new View.OnClickListener() {
@@ -168,9 +171,10 @@ public class GoodPeiFangActivity extends BaseActivity {
             @Override
             public void onMessage(Object msg) {
                 if (msg != null) {
-                    BPA_GOODS xx = (BPA_GOODS) msg;
-                    add_good.setData("保存", xx, goodstypes, activity);
+                    GoodsAPositionBean xx = (GoodsAPositionBean) msg;
+                    add_good.setData("保存", xx.goods, goodstypes, activity);
                     add_good.setVisibility(View.VISIBLE);
+                    typePos = xx.position;
                 }
             }
         });
@@ -179,21 +183,40 @@ public class GoodPeiFangActivity extends BaseActivity {
             @Override
             public void onMessage(Object msg) {
                 if (msg != null) {
-                    BPA_GOODS xx = (BPA_GOODS) msg;
-
-                    ArrayList<BPA_GOODSRECIPENAME>  name=QueryDB.GetGoodsRecipeNameGoodId(xx.id);
-                    for (BPA_GOODSRECIPENAME item:name)
-                    {
-                        ArrayList<ResGoodsRecipe> re= QueryDB.GetGoodsSreciperecipeList(item.id);
-                        for(ResGoodsRecipe item1:re)
-                        {
-                            QueryDB.DeleteGoodsSrecipe(item1);
+                    GoodsAPositionBean xx = (GoodsAPositionBean) msg;
+                    rv_right.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            AlertDialogUtils.showDialog(rv_right.getContext(),
+                                    "删除提示！",
+                                    "客官确定要删除商品,[" + xx.goods.name + "]吗？",
+                                    new QMUIDialogAction.ActionListener() {
+                                        @Override
+                                        public void onClick(QMUIDialog dialog, int index) {
+                                            ArrayList<BPA_GOODSRECIPENAME>  name=QueryDB.GetGoodsRecipeNameGoodId(xx.goods.id);
+                                            for (BPA_GOODSRECIPENAME item:name)
+                                            {
+                                                ArrayList<ResGoodsRecipe> re= QueryDB.GetGoodsSreciperecipeList(item.id);
+                                                for(ResGoodsRecipe item1:re)
+                                                {
+                                                    QueryDB.DeleteGoodsSrecipe(item1);
+                                                }
+                                                QueryDB.DeleteGoodsRecipeName(item);
+                                            }
+//                    Fdata.clear();
+                                            QueryDB.DeleteGoods(xx.goods);
+//                    Initdata();
+                                            BPA_GOODSTYPE bpaGoodstype = goodstypes.get(xx.position);
+                                            ArrayList<BPA_GOODS> goodsm = QueryDB.GetGoodsTypeId(bpaGoodstype.id);
+                                            Fdata.set(xx.position,new LinkMode(bpaGoodstype, Arrays.asList(goodsm.toArray()), false));
+                                            rightAdapter.notifyItemChanged(xx.position);
+                                            ToastUtils.info("删除成功!!!");
+                                            dialog.dismiss();
+                                        }
+                                    });
                         }
-                        QueryDB.DeleteGoodsRecipeName(item);
-                    }
-                    QueryDB.DeleteGoods(xx);
-                    Initdata();
-                    ToastUtils.info("删除成功!!!");
+                    });
+
                 }
             }
         });
@@ -222,11 +245,13 @@ public class GoodPeiFangActivity extends BaseActivity {
                 if (k == 0) {
                     add_good.setVisibility(View.GONE);
                 } else if (k == 1) {
-                    Initdata();
+//                    Initdata();
+                    rightAdapter.notifyItemChanged(typePos);
                     ToastUtils.info("执行成功!!!");
                     add_good.setVisibility(View.GONE);
                 } else if (k == 2) { //保存并新建配方
-                    Initdata();
+//                    Initdata();
+                    rightAdapter.notifyItemChanged(typePos);
                     ToastUtils.info("执行成功!!!");
                     add_good.setVisibility(View.GONE);
 
@@ -346,7 +371,7 @@ public class GoodPeiFangActivity extends BaseActivity {
                 Initdata();
             }
         });
-        rightAdapter = new GoodRightAdapter(R.layout.item_right_lc, Fdata, getResources());
+        rightAdapter = new GoodRightAdapter(getContext(), Fdata);
         rv_left.setAdapter(leftAdapter);
         rv_right.setAdapter(rightAdapter);
 
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SalesStatisticsActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SalesStatisticsActivity.java
index e32cb59e..4214db17 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SalesStatisticsActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SalesStatisticsActivity.java
@@ -197,6 +197,7 @@ public class SalesStatisticsActivity extends BaseActivity {
                 tj.name=item.name;
                 int count=0;
                 int countyzz=0;
+                int countCancel=0;
                 for (ResSubOrder order:subOrders)
                 {
                     if(order.goodsID.equals(item.id))
@@ -205,12 +206,15 @@ public class SalesStatisticsActivity extends BaseActivity {
                         if(order.status==2)
                         {
                             countyzz++;
+                        }else if(order.status == 4){
+                            countCancel++;
                         }
                     }
                 }
                 tj.Count=count;
                 tj.Yzz_Count=countyzz;
-                tj.Yc_Count=count-countyzz;
+                tj.Cancel_Count=countCancel;
+                tj.Yc_Count=count-countyzz-countCancel;
                 subOrdersStatic.add(tj);
             }
 
diff --git a/app/src/main/res/layout/activity_salesstatistics.xml b/app/src/main/res/layout/activity_salesstatistics.xml
index 75d6c9cd..60db20f1 100644
--- a/app/src/main/res/layout/activity_salesstatistics.xml
+++ b/app/src/main/res/layout/activity_salesstatistics.xml
@@ -158,6 +158,23 @@
                                             android:textColor="@color/white" />
                                     </RelativeLayout>
 
+                                    <RelativeLayout
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="2">
+
+                                        <TextView
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content"
+                                            android:layout_alignParentLeft="true"
+                                            android:layout_marginLeft="20dp"
+                                            android:text="取消订单(单)"
+                                            android:textAlignment="center"
+                                            android:textStyle="bold"
+                                            android:textColor="@color/white" />
+                                    </RelativeLayout>
+
+
                                     <RelativeLayout
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/datatab/layout/ddtj_item.xml b/app/src/main/res/layout/datatab/layout/ddtj_item.xml
index cc2ebae1..a5400d10 100644
--- a/app/src/main/res/layout/datatab/layout/ddtj_item.xml
+++ b/app/src/main/res/layout/datatab/layout/ddtj_item.xml
@@ -69,6 +69,24 @@
                     android:textSize="12dp" />
             </RelativeLayout>
 
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2">
+
+                <TextView
+                    android:id="@+id/ddzl_cancel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginLeft="20dp"
+                    android:text="取消"
+                    android:textAlignment="center"
+                    android:textColor="@color/black"
+                    android:textSize="12dp" />
+            </RelativeLayout>
+
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="30dp"
diff --git a/app/src/main/res/layout/item/layout/newgood_bj.xml b/app/src/main/res/layout/item/layout/newgood_bj.xml
index 2473906f..850252ca 100644
--- a/app/src/main/res/layout/item/layout/newgood_bj.xml
+++ b/app/src/main/res/layout/item/layout/newgood_bj.xml
@@ -6,6 +6,7 @@
     >
 
     <RelativeLayout
+        android:id="@+id/image"
         android:layout_marginTop="@dimen/dp_10"
         android:layout_marginLeft="@dimen/dp_10"
         android:layout_marginBottom="@dimen/dp_10"
@@ -46,8 +47,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
+                android:paddingRight="30dp"
                 android:textSize="16dp"
                 android:textColor="@color/light_blue_primary"
+                android:paddingTop="3dp"
+                android:paddingBottom="3dp"
                 android:text="修改"/>
             <TextView
                 android:id="@+id/delete_text"
@@ -57,6 +61,9 @@
                 android:textSize="16dp"
                 android:layout_alignParentRight="true"
                 android:textColor="@color/red_primary_dark"
+                android:paddingLeft="30dp"
+                android:paddingTop="3dp"
+                android:paddingBottom="3dp"
                 android:text="删除"/>
 
         </RelativeLayout>