Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java

@@ -129,7 +129,7 @@ public class SmErpSupplierTypeController {
     @Operation(summary = "下拉查询"  )
     @GetMapping("/simpleAll")
     public R getSimpleAll() {
-        List<SmErpSupplierTypeEntity> list = smErpSupplierTypeService.list();
+        List<SmErpSupplierTypeEntity> list = smErpSupplierTypeService.selectSimpleAllScope();
         List<SmErpSupplierTypeSimpleVo> bean = BeanUtils.toBean(list, SmErpSupplierTypeSimpleVo.class);
         return R.ok(bean);
     }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java

@@ -93,13 +93,13 @@ public class SmSpuController {
     public R save(@RequestBody SmSpuEntity smSpu) {
         Long deptId = SecurityUtils.getUser().getDeptId();
         //查询商户，设置商户id
-        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
-        MchManageVo data = byDeptId.getData();
-        if (Objects.isNull(data) || !data.getTypes().contains("2")){
-            return R.failed("当前用户未绑定超市商户");
-        }
+//        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
+//        MchManageVo data = byDeptId.getData();
+//        if (Objects.isNull(data) || !data.getTypes().contains("2")){
+//            return R.failed("当前用户未绑定超市商户");
+//        }
         smSpu.setDeptId(deptId);
-        smSpu.setMerchantId(data.getId());
+//        smSpu.setMerchantId(data.getId());
         return R.ok(smSpuService.save(smSpu));
     }
 

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity;
 
+import java.util.List;
+
 public interface SmErpSupplierTypeService extends IService<SmErpSupplierTypeEntity> {
 
 
@@ -16,4 +18,7 @@ public interface SmErpSupplierTypeService extends IService<SmErpSupplierTypeEnti
      * @return
      */
     Object pageScope(Page page, LambdaQueryWrapper<SmErpSupplierTypeEntity> wrapper);
+
+
+    List<SmErpSupplierTypeEntity> selectSimpleAllScope();
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java

@@ -441,6 +441,7 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl<SmErpInventory
     @Transactional
     public Object updateInventoryRecord(InventoryRecordEditDTO inventoryRecordEditDTO) {
 
+        Long deptId = SecurityUtils.getUser().getDeptId();
         SmErpInventoryRecordsEntity smErpInventoryRecordsEntity = BeanUtils.toBean(inventoryRecordEditDTO, SmErpInventoryRecordsEntity.class);
         int i = baseMapper.updateById(smErpInventoryRecordsEntity);
         List<InventoryRecordEditItemDTO> items = inventoryRecordEditDTO.getItems();
@@ -475,6 +476,11 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl<SmErpInventory
         List<SmErpInventoryRecordsItemEntity> updateItems =  smErpInventoryRecordsItemEntityList.stream().
                 filter(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getId() != null).collect(Collectors.toList());
 
+        // 为新增的项目设置inventoryId和deptId
+        insertItems.forEach(insertItem -> {
+            insertItem.setInventoryId(inventoryRecordEditDTO.getId());
+            insertItem.setDeptId(deptId);
+        });
 
         //更新的话，查询之前保存了哪些item，然后去库存表删掉从新计算库存
         List<SmErpInventoryRecordsItemEntity> dataBaseSmErpInventoryRecordsItemEntityList = smErpInventoryRecordsItemMapper

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java

@@ -7,7 +7,11 @@ import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity;
 import com.bsd.pjcloud.supermarket.mapper.SmErpSupplierTypeMapper;
 import com.bsd.pjcloud.supermarket.service.SmErpSupplierTypeService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+
 /**
  * 货商类别
  *
@@ -20,4 +24,9 @@ public class SmErpSupplierTypeServiceImpl extends ServiceImpl<SmErpSupplierTypeM
     public Object pageScope(Page page, LambdaQueryWrapper<SmErpSupplierTypeEntity> wrapper) {
        return baseMapper.selectPageByScope(page,wrapper, DataScope.of());
     }
+
+    @Override
+    public List<SmErpSupplierTypeEntity> selectSimpleAllScope() {
+        return baseMapper.selectListByScope(null, DataScope.of());
+    }
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml

@@ -30,7 +30,7 @@
           on sp.erp_spu_id = esp.id
           left join sm_erp_category eca
           on esp.category_id = eca.id
-
+            where  sp.del_flag = 0
     </select>
 
     <select id="getAppPage" resultType="com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo">