Merge remote-tracking branch 'origin/master'

hx-item/src/main/java/com/fjhx/item/controller/product/ProductInfoController.java

@@ -38,6 +38,14 @@ public class ProductInfoController {
     }
 
     /**
+     * 产品库分页 维多利亚
+     */
+    @PostMapping("/pageByWdly")
+    public Page<ProductInfoVo> pageByWdly(@RequestBody ProductInfoSelectDto dto) {
+        return productInfoService.getPageByWdly(dto);
+    }
+
+    /**
      * 产品库明细
      */
     @PostMapping("/detail")
@@ -54,6 +62,14 @@ public class ProductInfoController {
     }
 
     /**
+     * 产品库新增 维多利亚
+     */
+    @PostMapping("/addByWdly")
+    public void addByWdly(@RequestBody ProductInfoDto productInfoDto) {
+        productInfoService.addByWdly(productInfoDto);
+    }
+
+    /**
      * 产品库编辑
      */
     @PostMapping("/edit")
@@ -70,8 +86,17 @@ public class ProductInfoController {
     }
 
     @PostMapping("/excelImport")
-    public void issueExcelImport(@RequestParam("file") MultipartFile file){
+    public void issueExcelImport(@RequestParam("file") MultipartFile file) {
         productInfoService.excelImport(file);
     }
 
+    /**
+     * 产品部门移交 维多利亚
+     */
+    @PostMapping("/transfer")
+    public void transfer(@RequestBody ProductInfoDto productInfoDto) {
+        productInfoService.transfer(productInfoDto);
+    }
+
+
 }

hx-item/src/main/java/com/fjhx/item/entity/product/dto/ProductInfoDto.java

@@ -19,4 +19,9 @@ public class ProductInfoDto extends ProductInfo {
 
     private List<ObsFile> fileList;
 
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
 }

hx-item/src/main/java/com/fjhx/item/service/product/ProductInfoService.java

@@ -6,7 +6,6 @@ import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.ruoyi.common.core.service.BaseService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -28,6 +27,11 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
     Page<ProductInfoVo> getPage(ProductInfoSelectDto dto);
 
     /**
+     * 产品库分页 维多利亚
+     */
+    Page<ProductInfoVo> getPageByWdly(ProductInfoSelectDto dto);
+
+    /**
      * 产品库明细
      */
     ProductInfoVo detail(Long id);
@@ -38,6 +42,11 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
     void add(ProductInfoDto productInfoDto);
 
     /**
+     * 产品库新增 维多利亚
+     */
+    void addByWdly(ProductInfoDto productInfoDto);
+
+    /**
      * 产品库编辑
      */
     void edit(ProductInfoDto productInfoDto);
@@ -49,6 +58,7 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
 
     /**
      * 根据产品IDS获取产品
+     *
      * @param productIds
      * @return
      */
@@ -56,11 +66,18 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
 
     /**
      * 根据产品类型获取产品
+     *
      * @return
      */
     List<ProductInfoVo> getListByProductType(Integer productType);
 
-    /**excel导入*/
+    /**
+     * excel导入
+     */
     void excelImport(MultipartFile file);
 
+    /**
+     * 产品部门移交 维多利亚
+     */
+    void transfer(ProductInfoDto productInfoDto);
 }

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -65,7 +65,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
                 new SqlField("pi", ProductInfo::getCode),
                 new SqlField("pi", ProductInfo::getCustomCode)
         );
-        wrapper.eq("json_unquote(victoriatourist_json ->'$.lifeCycle')",dto.getLifeCycle());
+        wrapper.eq("json_unquote(victoriatourist_json ->'$.lifeCycle')", dto.getLifeCycle());
         Page<ProductInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<ProductInfoVo> records = page.getRecords();
@@ -95,6 +95,15 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             record.setClassifyNameGroup(classifyNameGroup);
 
         }
+
+        return page;
+    }
+
+
+    @Override
+    public Page<ProductInfoVo> getPageByWdly(ProductInfoSelectDto dto) {
+        Page<ProductInfoVo> page = getPage(dto);
+        List<ProductInfoVo> records = page.getRecords();
         //赋值维多利亚扩展部门名称
         List<Long> ids = new ArrayList<>();
         for (ProductInfoVo record : records) {
@@ -126,7 +135,6 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             json.put("deptName", sysDeptMap.get(json.getLong("deptId")));
             record.setVictoriatouristJson(json.toJSONString());
         }
-
         return page;
     }
 
@@ -146,13 +154,19 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         this.nameDuplication(ProductInfo::getName, productInfoDto.getName(), "产品名称重复");
         this.save(productInfoDto);
         ObsFileUtil.saveFile(productInfoDto.getFileList(), productInfoDto.getId());
+    }
+
+    @DSTransactional
+    @Override
+    public void addByWdly(ProductInfoDto productInfoDto) {
         //处理维多利亚扩展
         String victoriatouristJson = productInfoDto.getVictoriatouristJson();
-        if(ObjectUtil.isNotEmpty(victoriatouristJson)) {
+        if (ObjectUtil.isNotEmpty(victoriatouristJson)) {
             JSONObject json = JSONObject.parseObject(victoriatouristJson);
             json.put("deptId", SecurityUtils.getDeptId());
             productInfoDto.setVictoriatouristJson(json.toJSONString());
         }
+        add(productInfoDto);
     }
 
     @DSTransactional
@@ -200,4 +214,12 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
 //        List<Object> read = ExcelUtil.read(file, Object.class);
     }
 
+    @Override
+    public void transfer(ProductInfoDto productInfoDto) {
+        ProductInfo productInfo = getById(productInfoDto.getId());
+        String victoriatouristJson = productInfo.getVictoriatouristJson();
+        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
+        json.put("deptId", productInfoDto.getDeptId());
+    }
+
 }

hx-oa/src/main/java/com/fjhx/oa/entity/external/po/ExternalAddressBook.java

@@ -27,7 +27,7 @@ public class ExternalAddressBook extends BasePo {
     /**
      * 联系类型（字典contact_information）
      */
-    private Integer type;
+    private String type;
 
     /**
      * 联系号码

hx-oa/src/main/java/com/fjhx/oa/entity/internal/po/InternalAddressBook.java

@@ -27,7 +27,7 @@ public class InternalAddressBook extends BasePo {
     /**
      * 联系类型（字典contact_information）
      */
-    private Integer type;
+    private String type;
 
     /**
      * 联系号码

hx-oa/src/main/java/com/fjhx/oa/service/internal/impl/InternalAddressBookServiceImpl.java

@@ -79,6 +79,9 @@ public class InternalAddressBookServiceImpl extends ServiceImpl<InternalAddressB
         List<Long> internalAddressBookIds = internalAddressBookList.stream().filter(item-> ObjectUtil.isNotEmpty(item.getId())).map(InternalAddressBook::getId).collect(Collectors.toList());
         if(ObjectUtil.isNotEmpty(internalAddressBookIds)) {
             remove(q -> q.notIn(InternalAddressBook::getId, internalAddressBookIds).eq(InternalAddressBook::getUserId, internalAddressBookDto.getUserId()));
+        }else{
+            //如果传的列表为空直接全部删除
+            remove(q -> q.eq(InternalAddressBook::getUserId, internalAddressBookDto.getUserId()));
         }
         saveOrUpdateBatch(internalAddressBookList);
     }

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -168,12 +168,14 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         Subscribe byId1 = subscribeService.getById(byId.getSubscribeId());
         String victoriatouristJson1 = byId1.getVictoriatouristJson();
         if(ObjectUtil.isNotEmpty(victoriatouristJson1)){
+            //去申购单取仓库id
             JSONObject json1 = JSONObject.parseObject(victoriatouristJson1);
             Long receiptWarehouseId = json1.getLong("receiptWarehouseId");
             json.put("receiptWarehouseId",receiptWarehouseId);
-            CompanyInfo logisticsCompanyCode = companyInfoService.getOne(q -> q.eq(CompanyInfo::getCode, json.getString("logisticsCompanyCode")));
-            json.put("logisticsCompanyName",logisticsCompanyCode.getName());
         }
+        //赋值物流公司名称
+        CompanyInfo logisticsCompanyCode = companyInfoService.getOne(q -> q.eq(CompanyInfo::getCode, json.getString("logisticsCompanyCode")));
+        json.put("logisticsCompanyName",logisticsCompanyCode.getName());
         //修改发货记录的状态为到货
         Long deliverGoodsId = json.getLong("deliverGoodsId");
         wdlyService.updateDeliverGoodsStatus(deliverGoodsId);

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackServiceImpl.java

@@ -66,9 +66,9 @@ public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> impleme
     @Override
     public Page<JdBackVo> getPage(JdBackSelectDto dto) {
         IWrapper<JdBack> wrapper = getWrapper();
-        wrapper.like(JdBackVo::getLogisticsCode, dto.getKeyword());
-        wrapper.eq(JdBackVo::getType, dto.getType());
-        wrapper.eq(JdBackVo::getStatus, dto.getStatus());
+        wrapper.like("jb",JdBackVo::getLogisticsCode, dto.getKeyword());
+        wrapper.eq("jb",JdBackVo::getType, dto.getType());
+        wrapper.eq("jb",JdBackVo::getStatus, dto.getStatus());
         wrapper.orderByDesc("jb", JdBack::getId);
         Page<JdBackVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<JdBackVo> records = page.getRecords();

hx-wms/src/main/java/com/fjhx/wms/entity/warehouse/po/Warehouse.java

@@ -26,7 +26,7 @@ public class Warehouse extends BasePo {
     /**
      * 仓库类型
      */
-    private Integer type;
+    private String type;
 
     /**
      * 备注