5/23

src/main/java/com/yxt/goods/apiadmin/GoodsBrandRest.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.goods.biz.goodsbrandinfo.*;
+import com.yxt.goods.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,9 @@ public class GoodsBrandRest {
         return baseBrandInfoService.listPage(pq);
     }
     @ApiOperation("查询所有的品牌")
-    @GetMapping("/listAll")
-    public ResultBean<List<GoodsBrandInfo>> listAll() {
-        return baseBrandInfoService.listAll();
+    @PostMapping("/listAll")
+    public ResultBean<List<GoodsBrandInfo>> listAll(@RequestBody OrgPathQuery query) {
+        return baseBrandInfoService.listAll(query);
     }
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")
@@ -52,6 +53,13 @@ public class GoodsBrandRest {
         return baseBrandInfoService.delete(sid);
     }
 
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        baseBrandInfoService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")

src/main/java/com/yxt/goods/apiadmin/GoodsManufacturerRest.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.goods.biz.goodsmanufacturer.*;
+import com.yxt.goods.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,9 +32,9 @@ public class GoodsManufacturerRest {
     }
 
     @ApiOperation("查询所有的厂家")
-    @GetMapping("/listAll")
-    public ResultBean<List<GoodsManufacturer>> listAll() {
-        return baseManufacturerService.listAll();
+    @PostMapping("/listAll")
+    public ResultBean<List<GoodsManufacturer>> listAll(@RequestBody OrgPathQuery query) {
+        return baseManufacturerService.listAll(query);
     }
 
     @ApiOperation("保存修改")
@@ -54,6 +55,13 @@ public class GoodsManufacturerRest {
         return baseManufacturerService.delete(sid);
     }
 
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        baseManufacturerService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")

src/main/java/com/yxt/goods/apiadmin/GoodsTypeRest.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.goods.biz.goodstype.*;
+import com.yxt.goods.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,9 @@ public class GoodsTypeRest {
         return goodsTypeService.listPage(pq);
     }
     @ApiOperation("查询所有的类别")
-    @GetMapping("/listAll")
-    public ResultBean<List<GoodsType>> listAll() {
-        return goodsTypeService.listAll();
+    @PostMapping("/listAll")
+    public ResultBean<List<GoodsType>> listAll(@RequestBody OrgPathQuery query) {
+        return goodsTypeService.listAll(query);
     }
 
     @ApiOperation("保存修改")
@@ -53,6 +54,13 @@ public class GoodsTypeRest {
         return goodsTypeService.delete(sid);
     }
 
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        goodsTypeService.delAll(sids);
+        return rb.success();
+    }
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
@@ -64,4 +72,9 @@ public class GoodsTypeRest {
     public ResultBean<GoodsType> getTypeByName(@PathVariable("name") String name) {
         return goodsTypeService.getTypeByName(name);
     }
+    @ApiOperation("更改商品是否一品一码")
+    @GetMapping("/updateIsGoodsID/{sid}/{state}")
+    public ResultBean updateIsGoodsID(@PathVariable("sid") String sid,@PathVariable("state")String state) {
+        return goodsTypeService.updateProductCode(sid,state);
+    }
 }

src/main/java/com/yxt/goods/apiadmin/GoodsUnitRest.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.goods.biz.goodsunit.*;
+import com.yxt.goods.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,9 @@ public class GoodsUnitRest {
         return goodsUnitService.listPage(pq);
     }
     @ApiOperation("查询所有的类别")
-    @GetMapping("/listAll")
-    public ResultBean<List<GoodsUnit>> listAll() {
-        return goodsUnitService.listAll();
+    @PostMapping("/listAll")
+    public ResultBean<List<GoodsUnit>> listAll(@RequestBody OrgPathQuery query) {
+        return goodsUnitService.listAll(query);
     }
 
     @ApiOperation("保存修改")
@@ -53,6 +54,14 @@ public class GoodsUnitRest {
         return goodsUnitService.delete(sid);
     }
 
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+        ResultBean rb = ResultBean.fireFail();
+        goodsUnitService.delAll(sids);
+        return rb.success();
+    }
+
 
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")

src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java

@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
  */
 @Mapper
 public interface GoodsBrandInfoMapper extends BaseMapper<GoodsBrandInfo> {
-
+    int updateBySidIsDelete(List<String> list);
     IPage<GoodsBrandInfoVo> listPage(IPage<GoodsBrandInfo> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsBrandInfo> qw);
 }

src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml

@@ -12,4 +12,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE goods_brand_info
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>

src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoQuery.java

@@ -10,4 +10,6 @@ import lombok.Data;
 @Data
 public class GoodsBrandInfoQuery implements Query {
     private String name;
+    private String userOrgSid;
+    private String createOrgSid;//创建组织sid
 }

src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java

@@ -11,13 +11,17 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.goods.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -36,6 +40,10 @@ public class GoodsBrandInfoService extends MybatisBaseService<GoodsBrandInfoMapp
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("brandName",query.getName());
         }
+//        if(StringUtils.isNotBlank(query.getUserOrgSid())){
+//            qw.eq("userOrgSid",query.getUserOrgSid());
+//        }
+        qw.ne("isDelete","1");
         IPage<GoodsBrandInfo> page = PagerUtil.queryToPage(pq);
         IPage<GoodsBrandInfoVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<GoodsBrandInfoVo> p = PagerUtil.pageToVo(pagging, null);
@@ -50,9 +58,12 @@ public class GoodsBrandInfoService extends MybatisBaseService<GoodsBrandInfoMapp
 //        }
         return rb.success().setData(p);
     }
-    public ResultBean<List<GoodsBrandInfo>> listAll() {
+    public ResultBean<List<GoodsBrandInfo>> listAll( OrgPathQuery query) {
     ResultBean rb = ResultBean.fireFail();
-    List<GoodsBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<GoodsBrandInfo>().eq("isEnable",1));
+
+//    List<GoodsBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<GoodsBrandInfo>().eq("isEnable",1).ne("isDelete","1")
+//            .eq("userOrgSid",query.getUserOrgSid()));
+        List<GoodsBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<GoodsBrandInfo>().eq("isEnable",1).ne("isDelete","1"));
     return rb.success().setData(pagging);
 }
     public ResultBean<String> saveOrUpdate(GoodsBrandInfoDto dto) {
@@ -114,6 +125,9 @@ public class GoodsBrandInfoService extends MybatisBaseService<GoodsBrandInfoMapp
         }
         return rb.success().setMsg("成功");
     }
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         GoodsBrandInfo wmsGoodsBrand = fetchBySid(sid);

src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.java

@@ -18,4 +18,5 @@ public interface GoodsManufacturerMapper extends BaseMapper<GoodsManufacturer> {
     IPage<GoodsManufacturerVo> listPage(IPage<GoodsManufacturer> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsManufacturer> qw);
 
     List<GoodsManufacturerVo> getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid);
+    int updateBySidIsDelete(List<String> list);
 }

src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml

@@ -17,4 +17,12 @@
         from goods_manufacturer
         where useOrgSid = #{useOrgSid}
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE goods_manufacturer
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>

src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java

@@ -10,4 +10,6 @@ import lombok.Data;
 @Data
 public class GoodsManufacturerQuery implements Query {
     private String name;
+    private String userOrgSid;
+    private String createOrgSid;//创建组织sid
 }

src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java

@@ -10,11 +10,15 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.goods.utils.OrgPathQuery;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -31,16 +35,20 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("goodsTypeName",query.getName());
         }
-
+        qw.ne("isDelete","1");
+        qw.orderByDesc("sortNo");
         IPage<GoodsManufacturer> page = PagerUtil.queryToPage(pq);
         IPage<GoodsManufacturerVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<GoodsManufacturerVo> p = PagerUtil.pageToVo(pagging, null);
         List<GoodsManufacturerVo> records = pagging.getRecords();
         return rb.success().setData(p);
     }
-    public ResultBean<List<GoodsManufacturer>> listAll() {
+    public ResultBean<List<GoodsManufacturer>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<GoodsManufacturer> pagging = baseMapper.selectList(new QueryWrapper<GoodsManufacturer>().eq("isEnable",1));
+//        List<GoodsManufacturer> pagging = baseMapper.selectList(new QueryWrapper<GoodsManufacturer>().eq("isEnable",1).ne("isDelete","1")
+//                .eq("userOrgSid",query.getUserOrgSid()));
+        List<GoodsManufacturer> pagging = baseMapper.selectList(new QueryWrapper<GoodsManufacturer>().eq("isEnable",1).ne("isDelete","1")
+                );
         return rb.success().setData(pagging);
     }
 
@@ -93,6 +101,11 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
         }
         return rb.success();
     }
+
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
+
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         GoodsManufacturer wmsManufacturer = fetchBySid(sid);

src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuQuery.java

@@ -10,4 +10,6 @@ import lombok.Data;
 @Data
 public class GoodsSkuQuery implements Query {
     private String name;
+    private String userOrgSid;
+    private String createOrgSid;//创建组织sid
 }

src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java

@@ -51,6 +51,9 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("goodsName", query.getName());
         }
+//        if(StringUtils.isNotBlank(query.getUserOrgSid())){
+//            qw.eq("userOrgSid",query.getUserOrgSid());
+//        }
         IPage<GoodsSku> page = PagerUtil.queryToPage(pq);
         IPage<GoodsSkuVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<GoodsSkuVo> p = PagerUtil.pageToVo(pagging, null);

src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendQuery.java

@@ -10,4 +10,6 @@ import lombok.Data;
 @Data
 public class GoodsSkuExtendQuery implements Query {
     private String name;
+    private String userOrgSid;
+    private String createOrgSid;//创建组织sid
 }

src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java

@@ -49,6 +49,9 @@ public class GoodsSkuExtendService extends MybatisBaseService<GoodsSkuExtendMapp
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("goodsName",query.getName());
         }
+//        if(StringUtils.isNotBlank(query.getUserOrgSid())){
+//            qw.eq("userOrgSid",query.getUserOrgSid());
+//        }
         IPage<GoodsSkuExtend> page = PagerUtil.queryToPage(pq);
         IPage<GoodsSkuExtendVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<GoodsSkuExtendVo> p = PagerUtil.pageToVo(pagging, null);
@@ -68,16 +71,40 @@ public class GoodsSkuExtendService extends MybatisBaseService<GoodsSkuExtendMapp
         ResultBean rb = ResultBean.fireFail();
         String sid = "";
         GoodsSkuExtend extend=baseMapper.selectOne(new QueryWrapper<GoodsSkuExtend>().eq("sid",dto.getSid()));
+        if(StringUtils.isBlank(dto.getCostPrice())){
+            dto.setCostPrice("0");
+        }
+        if(StringUtils.isBlank(dto.getTagPrice())){
+            dto.setTagPrice("0");
+        }
+        if(StringUtils.isBlank(dto.getSalesPrice())){
+            dto.setSalesPrice("0");
+        }
+         if(StringUtils.isBlank(dto.getAgencyPrice())){
+            dto.setAgencyPrice("0");
+        }
+        if(StringUtils.isBlank(dto.getStandardPurchasePrice())){
+            dto.setStandardPurchasePrice("0");
+        }
+        if(StringUtils.isBlank(dto.getMinimumSalesPrice())){
+            dto.setMinimumSalesPrice("0");
+        }
+        if(StringUtils.isBlank(dto.getIsLockingSalesPrice())){
+            dto.setIsLockingSalesPrice("0");
+        }
+        if(StringUtils.isBlank(dto.getSortNo())){
+            dto.setSortNo("1");
+        }
         if (null!=extend) {
             sid = dto.getSid();
             GoodsSkuExtend wmsGoods = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setModifyTime(new Date());
+            wmsGoods.setPicUrl("");
             for (UrlsVo url : dto.getUrls()) {
-                wmsGoods.setPicUrl("");
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 String path = url.getUrl().substring(urlPrefix.length());
-                if(StringUtils.isBlank(dto.getPicUrl())){
+                if(StringUtils.isBlank(wmsGoods.getPicUrl())){
                     wmsGoods.setPicUrl(path);
                 }else{
                     wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);
@@ -94,7 +121,7 @@ public class GoodsSkuExtendService extends MybatisBaseService<GoodsSkuExtendMapp
                 for (UrlsVo url : dto.getUrls()) {
                     String urlPrefix = fileUploadComponent.getUrlPrefix();
                     String path = url.getUrl().substring(urlPrefix.length());
-                    if(StringUtils.isBlank(dto.getPicUrl())){
+                    if(StringUtils.isBlank(wmsGoods.getPicUrl())){
                         wmsGoods.setPicUrl(path);
                     }else{
                         wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);

src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml

@@ -10,7 +10,7 @@
         from goods_spu s
         left join goods_type a on a.sid=s.goodsTypeSid
         left join goods_brand_info b on b.sid=s.brandSid
-        left join base_manufacturer c on c.sid=s.manufacturerSid
+        left join goods_manufacturer c on c.sid=s.manufacturerSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -21,7 +21,7 @@
         from goods_spu s
         left join goods_type a on a.sid=s.goodsTypeSid
         left join goods_brand_info b on b.sid=s.brandSid
-        left join base_manufacturer c on c.sid=s.manufacturerSid
+        left join goods_manufacturer c on c.sid=s.manufacturerSid
         where s.sid=#{sid}
     </select>
 </mapper>

src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java

@@ -10,4 +10,6 @@ import lombok.Data;
 @Data
 public class GoodsSpuQuery implements Query {
     private String name;
+    private String userOrgSid;
+    private String createOrgSid;//创建组织sid
 }

src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java

@@ -76,6 +76,9 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("goodsName", query.getName());
         }
+//        if(StringUtils.isNotBlank(query.getUserOrgSid())){
+//            qw.eq("userOrgSid",query.getUserOrgSid());
+//        }
         IPage<GoodsSpu> page = PagerUtil.queryToPage(pq);
         IPage<GoodsSpuVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<GoodsSpuVo> p = PagerUtil.pageToVo(pagging, null);
@@ -100,7 +103,9 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
         if (null != goodsUnit) {
             dto.setGoodsUnitName(goodsUnit.getUnitName());
         }
-
+        if(StringUtils.isBlank(dto.getIsListed())){
+            dto.setIsListed("1");
+        }
         if (spun != null) {
             if (!spun.getSid().equals(dto.getSid())) {
                 return rb.setMsg("商品编码重复");
@@ -109,7 +114,8 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
             GoodsSpu wmsGoods = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setModifyTime(new Date());
-            wmsGoods.setGoodsPY(PinYinUtils.getPinYinName(wmsGoods.getGoodsName()));
+//            wmsGoods.setGoodsPY(PinYinUtils.getPinYinName(wmsGoods.getGoodsName()));
+            wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));;
             ;
             baseMapper.updateById(wmsGoods);
             //spu详情
@@ -129,6 +135,7 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
             sid = wmsGoods.getSid();
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setCreateTime(new DateTime());
+            wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));;
             baseMapper.insert(wmsGoods);
             //spu详情
             dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());

src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailQuery.java

@@ -10,4 +10,6 @@ import lombok.Data;
 @Data
 public class BaseGoodsSpuDetailQuery implements Query {
     private String name;
+    private String userOrgSid;
+    private String createOrgSid;//创建组织sid
 }

src/main/java/com/yxt/goods/biz/goodsspudetail/BaseGoodsSpuDetailService.java

@@ -23,6 +23,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * @author wangpengfei
@@ -45,6 +46,9 @@ public class BaseGoodsSpuDetailService extends MybatisBaseService<GoodsSpuDetail
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("goodsName",query.getName());
         }
+//        if(StringUtils.isNotBlank(query.getUserOrgSid())){
+//            qw.eq("userOrgSid",query.getUserOrgSid());
+//        }
         IPage<GoodsSpuDetail> page = PagerUtil.queryToPage(pq);
         IPage<BaseGoodsSpuDetailVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<BaseGoodsSpuDetailVo> p = PagerUtil.pageToVo(pagging, null);
@@ -67,7 +71,9 @@ public class BaseGoodsSpuDetailService extends MybatisBaseService<GoodsSpuDetail
             sid = goodsSpuDetail.getSid();
             BeanUtil.copyProperties(dto, goodsSpuDetail);
             goodsSpuDetail.setCreateTime(new DateTime());
-
+            if(StringUtils.isEmpty(goodsSpuDetail.getSid())){
+                goodsSpuDetail.setSid(UUID.randomUUID().toString());
+            }
             baseMapper.insert(goodsSpuDetail);
         }
         return rb.success().setMsg("成功");

src/main/java/com/yxt/goods/biz/goodstype/GoodsType.java

@@ -15,8 +15,9 @@ public class GoodsType extends BaseEntity {
     private String percentageAmount;//提成金额
     private String pSid;//父级sid
     private String isParent;//是否为父节点，0为否，1为是，0标识为叶子节点
-    private String isGoodsID;//是否一品一码  0 否 1是
+    private String isGoodsID="1";//是否一品一码  0 否 1是
     private String sortNo;//排序
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String outStockRule;//出库规则
 }

src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeDto.java

@@ -30,4 +30,8 @@ public class GoodsTypeDto implements Dto {
     private String createOrgSid;//创建组织sid
     private String pName;//创建组织sid
     private String sids;//父级sid
+    private String outStockRule;//出库规则
+    private String outStockRuleValue;//出库规则 先进先出0、先进后出1、保质期优先2
+    private String userSid;
+    private String orgPath;
 }

src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.java

@@ -7,11 +7,15 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
  */
 @Mapper
 public interface GoodsTypeMapper extends BaseMapper<GoodsType> {
+
+    int updateBySidIsDelete(List<String> list);
     IPage<GoodsTypeVo> listPage(IPage<GoodsType> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsType> qw);
 }

src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml

@@ -12,4 +12,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE goods_type
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>

src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java

@@ -9,5 +9,11 @@ import lombok.Data;
  */
 @Data
 public class GoodsTypeQuery implements Query {
-    private String name;
+    private String name;//名字
+    private String code;//编码
+    private String IsGoodID;//是否一品一码（goodID），0否，1是
+    private String outStockRule;//出库规则（先进先出0、先进后出1、保质期优先2）
+    private String userOrgSid;
+    private String createOrgSid;//创建组织sid
+
 }

src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java

@@ -10,11 +10,14 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.goods.utils.OrgPathQuery;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -31,7 +34,20 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("goodsTypeName",query.getName());
         }
-
+        if(StringUtils.isNotBlank(query.getCode())){
+            qw.like("goodsTypeCode",query.getCode());
+        }
+        if(StringUtils.isNotBlank(query.getIsGoodID())){
+            qw.eq("isGoodsID",query.getIsGoodID());
+        }
+        if(StringUtils.isNotBlank(query.getOutStockRule())){
+            qw.eq("outStockRule",query.getOutStockRule());
+        }
+//        if(StringUtils.isNotBlank(query.getUserOrgSid())){
+//            qw.eq("userOrgSid",query.getUserOrgSid());
+//        }
+        qw.ne("isDelete","1");
+        qw.orderByDesc("sortNo");
         IPage<GoodsType> page = PagerUtil.queryToPage(pq);
         IPage<GoodsTypeVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<GoodsTypeVo> p = PagerUtil.pageToVo(pagging, null);
@@ -39,14 +55,20 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
         for (GoodsTypeVo record : records) {
             if(StringUtils.isNotBlank(record.getPSid())){
                 GoodsType wmsGoodsType1 = fetchBySid(record.getPSid());
-                record.setPName(wmsGoodsType1.getGoodsTypeName());
+                if(wmsGoodsType1!=null){
+                    record.setPName(wmsGoodsType1.getGoodsTypeName());
+                }
                 record.setSids(record.getPSid());
             }
         }
         return rb.success().setData(p);
-    }    public ResultBean<List<GoodsType>> listAll() {
+    }
+    public ResultBean<List<GoodsType>> listAll(OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<GoodsType> pagging = baseMapper.selectList(new QueryWrapper<GoodsType>().eq("isEnable",1));
+//        List<GoodsType> pagging = baseMapper.selectList(new QueryWrapper<GoodsType>().eq("isEnable",1).ne("isDelete","1")
+//                .eq("userOrgSid",query.getUserOrgSid()));
+        List<GoodsType> pagging = baseMapper.selectList(new QueryWrapper<GoodsType>().eq("isEnable",1).ne("isDelete","1")
+                );
         return rb.success().setData(pagging);
     }
 
@@ -73,6 +95,9 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
             if(StringUtils.isBlank(wmsGoods.getPSid())){
                 wmsGoods.setIsParent("1");
             }
+            if(StringUtils.isBlank(wmsGoods.getIsGoodsID())){
+                wmsGoods.setIsGoodsID("1");
+            }
             baseMapper.insert(wmsGoods);
         }
         return rb.success().setMsg("成功");
@@ -108,6 +133,9 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
         }
         return rb.success();
     }
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         GoodsType wmsGoodsType = fetchBySid(sid);
@@ -122,5 +150,13 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
         GoodsType type=baseMapper.selectOne(new QueryWrapper<GoodsType>().eq("goodsTypeName",name));
         return rb.success().setData(type);
     }
-
+    public ResultBean updateProductCode(String sid,String state) {
+        ResultBean rb = ResultBean.fireFail();
+        GoodsType wmsGoodsType = fetchBySid(sid);
+        if (null != wmsGoodsType) {
+            wmsGoodsType.setIsGoodsID(state);
+            baseMapper.updateById(wmsGoodsType);
+        }
+        return rb.success().setMsg("成功");
+    }
 }

src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java

@@ -35,4 +35,5 @@ public class GoodsTypeVo implements Vo {
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
     private String sids;//创建组织sid
+    private String outStockRule;//出库规则
 }

src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:40
@@ -14,4 +16,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface GoodsUnitMapper extends BaseMapper<GoodsUnit> {
     IPage<GoodsUnitVo> listPage(IPage<GoodsUnit> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsUnit> qw);
+    int updateBySidIsDelete(List<String> list);
 }

src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml

@@ -12,4 +12,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <update id="updateBySidIsDelete">
+        UPDATE goods_unit
+        SET isDelete=1
+        where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
 </mapper>

src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java

@@ -10,4 +10,6 @@ import lombok.Data;
 @Data
 public class GoodsUnitQuery implements Query {
     private String name;
+    private String userOrgSid;
+    private String createOrgSid;//创建组织sid
 }

src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java

@@ -10,11 +10,15 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.goods.utils.OrgPathQuery;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -37,9 +41,12 @@ public class GoodsUnitService extends MybatisBaseService<GoodsUnitMapper, GoodsU
         PagerVo<GoodsUnitVo> p = PagerUtil.pageToVo(pagging, null);
         List<GoodsUnitVo> records = pagging.getRecords();
         return rb.success().setData(p);
-    }    public ResultBean<List<GoodsUnit>> listAll() {
+    }    public ResultBean<List<GoodsUnit>> listAll( OrgPathQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<GoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<GoodsUnit>().eq("isEnable",1));
+//        List<GoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<GoodsUnit>().eq("isEnable",1).ne("isDelete","1")
+//                .eq("userOrgSid",query.getUserOrgSid()));
+        List<GoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<GoodsUnit>().eq("isEnable",1).ne("isDelete","1")
+                );
         return rb.success().setData(pagging);
     }
 
@@ -95,6 +102,11 @@ public class GoodsUnitService extends MybatisBaseService<GoodsUnitMapper, GoodsU
         }
         return rb.success();
     }
+
+    public void delAll(String[] sids) {
+        int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+    }
+
     public ResultBean updateIsEnable(String sid,String isEnable) {
         ResultBean rb = ResultBean.fireFail();
         GoodsUnit wmsGoodsType = fetchBySid(sid);

src/main/java/com/yxt/goods/feign/portal/sysorganization/SysOrganizationFeign.java

@@ -1,35 +0,0 @@
-package com.yxt.goods.feign.portal.sysorganization;
-
-import com.yxt.common.core.result.ResultBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysOrganizationFeign.java <br/>
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign <br/>
- * Description: 组织机构表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
-@Api(tags = "组织机构表")
-@FeignClient(
-        contextId = "anrui-portal-SysOrganization",
-        name = "anrui-portal",
-        path = "v1/sysorganization")
-public interface SysOrganizationFeign {
-
-    @ApiOperation("获取一条记录 根据sid")
-    @ResponseBody
-    @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid);
-}

src/main/java/com/yxt/goods/feign/portal/sysorganization/SysOrganizationVo.java

@@ -1,88 +0,0 @@
-package com.yxt.goods.feign.portal.sysorganization;
-
-
-import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysOrganizationVo.java <br/>
- * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo <br/>
- * Description: 组织机构表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
-@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象")
-@Data
-public class SysOrganizationVo implements Vo {
-    @ApiModelProperty("部门/组织名称")
-    private String name;
-    
-	@ApiModelProperty("父(部门/组织) sid")
-    private String psid;
-    
-	@ApiModelProperty("联系电话")
-    private String linkPhone;
-
-	@ApiModelProperty("联系人")
-    private String linkPerson;
-
-	@ApiModelProperty("部门sid全路径")
-    private String orgSidPath;
-    
-	@ApiModelProperty("排序")
-    private Integer sort;
-    
-	@ApiModelProperty("地址")
-    private String addrs;
-    
-	@ApiModelProperty("地理位置经纬度")
-    private String jwd;
-    
-	@ApiModelProperty("二维码")
-    private String qrText;
-    
-	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
-    private Integer limitOrgMember;
-    
-	@ApiModelProperty("部门编码")
-    private String orgCode;
-	@ApiModelProperty("sid")
-    private String sid;
-    @ApiModelProperty("子集")
-	private List<SysOrganizationVo> children = new ArrayList<>();
-    @ApiModelProperty("主管人员名称")
-    private String zgNames;
-    @ApiModelProperty("分管人员名称")
-    private String fgNames;
-    @ApiModelProperty("主管人员sid")
-    private String zgStaffSid;
-    @ApiModelProperty("分管人员sid")
-    private String fgStaffSid;
-    @ApiModelProperty("组织简称")
-    private String orgAbbre;
-    @ApiModelProperty("是否是部门(0否，1是)")
-    private Integer isDept;
-    @ApiModelProperty("组织属性key")
-    private String orgAttributeKey;
-    @ApiModelProperty("组织属性value")
-    private String orgAttributeValue;
-    @ApiModelProperty("管理层级key")
-    private String orgLevelKey;
-    @ApiModelProperty("管理层级value")
-    private String orgLevelValue;
-    @ApiModelProperty("其他编码")
-    private String otherCode;
-    @ApiModelProperty("主管用户sid")
-    private String managerSid;
-}

src/main/java/com/yxt/goods/feign/portal/sysstafforg/SysStaffOrgFeign.java

@@ -1,25 +0,0 @@
-package com.yxt.goods.feign.portal.sysstafforg;
-
-import com.yxt.common.core.result.ResultBean;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * @description: 人员与机构
- * @author: dimengzhe
- * @date: 2024/3/6
- **/
-@FeignClient(
-        contextId = "anrui-portal-SysStaffOrg",
-        name = "anrui-portal",
-        path = "v1/sysstafforg")
-public interface SysStaffOrgFeign {
-
-    @GetMapping("/getOrgSidByPath")
-    @ResponseBody
-    @ApiOperation("根据用户组织全路径获取用户的分公司sid")
-    ResultBean<String> getOrgSidByPath(@RequestParam("orgPath") String orgPath);
-}

src/main/java/com/yxt/goods/utils/OrgPathQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.goods.utils;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/17 14:15
+ */
+@Data
+public class OrgPathQuery {
+    private String orgPath;
+    private String userOrgSid;
+}

src/main/java/com/yxt/goods/utils/PinYinUtils.java

@@ -29,7 +29,22 @@ public class PinYinUtils {
         //用v表示ü
         format.setVCharType(HanyuPinyinVCharType.WITH_V);
     }
-
+    /**
+     * 缩写
+     * @param args
+     */
+    public static String sx(String hz) {
+        char [] nameArray = hz.toCharArray();
+        String b="";
+        for (int i = 0; i < nameArray.length; i++) {
+            if (Character.toString(nameArray[i]).matches("^[\u4e00-\u9fa5]+$")) {
+                b=b+PinYinUtils.getCharDuoPinYinChar(String.valueOf(nameArray[i]));
+            }else{
+                b=b+String.valueOf(nameArray[i]);
+            }
+        }
+        return b;
+    }
     // 多音字
     private static final Map<String, Object> DYZMAP = setDYZMap();