Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java

@@ -136,7 +136,10 @@ public class MaterialDO extends TenantBaseDO {
      * 物料logo地址
      */
     private String logo;
-
+    /**
+     * 是否删除
+     */
+    private Boolean deleted;
     /**
      * 存货属性 0b0000000
      * 第1位 外购

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -602,14 +602,13 @@ public class ChanjetManager {
 
         }while (maxTs != null);
 
-        // 禁用
+        // 删除
-        LambdaUpdateWrapper<MaterialDO> updateWrapper = new LambdaUpdateWrapper<MaterialDO>(){{
+        LambdaQueryWrapper<MaterialDO> wrapper = new LambdaQueryWrapper<MaterialDO>(){{
-            set(MaterialDO::getStatus, ValidStatusEnum.INVALID.getCode());
         }};
         if(!materialIds.isEmpty()){
-            updateWrapper.notIn(MaterialDO::getId, materialIds);
+            wrapper.notIn(MaterialDO::getId, materialIds);
         }
-        materialMapper.update(updateWrapper);
+        materialMapper.delete(wrapper);
     }
 
     /**