仓库库位信息

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

@@ -205,7 +205,10 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());//采购到货
         //将业务信息设置成采购id和采购编码
         stockWait.setBusinessId(purchase.getId());
-        stockWait.setBusinessCode(purchase.getCode());
+        String victoriatouristJson2 = purchase.getVictoriatouristJson();
+        JSONObject json2 = ObjectUtil.isNotEmpty(victoriatouristJson2) ? JSONObject.parseObject(victoriatouristJson2):new JSONObject();
+//        stockWait.setBusinessCode(purchase.getCode());
+        stockWait.setBusinessCode(json2.getString("contractCode"));
 
         json.put("arrivalId", arrival.getId());
         json.put("arrivalCode", arrival.getCode());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/vo/QualityInfoVo.java

@@ -5,7 +5,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 质检列表查询返回值实体
@@ -72,6 +71,10 @@ public class QualityInfoVo extends QualityInfo {
      */
     private Integer qualityStatus;
 
+    /**
+     * 合同单号
+     */
+    private String contractCode;
 
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.victoriatourist.service.deliver.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -132,7 +133,10 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
         //创建物流信息
         LogisticsInfos logisticsInfos = new LogisticsInfos();
         logisticsInfos.setBusinessId(deliverGoodsDto.getId());//设置业务id为发货id
-        logisticsInfos.setBusinessCode(purchase.getCode());//设置采购单号为业务单号
+//        logisticsInfos.setBusinessCode(purchase.getCode());//设置采购单号为业务单号
+        String victoriatouristJson2 = purchase.getVictoriatouristJson();
+        JSONObject json2 = ObjectUtil.isNotEmpty(victoriatouristJson2) ? JSONObject.parseObject(victoriatouristJson2):new JSONObject();
+        logisticsInfos.setBusinessCode(json2.getString("contractCode"));
         logisticsInfos.setBusinessType(1);//采购到货
         logisticsInfos.setStatus(0);
         logisticsInfos.setInStockStatus(10);

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -177,6 +177,8 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             }
         }
 
+        this.save(qualityInfoDto);
+
         if (qFlag != 0) {
             AbnormalInfo abnormalInfo = new AbnormalInfo();
             abnormalInfo.setStatus(0);
@@ -188,7 +190,6 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             abnormalInfoService.save(abnormalInfo);
         }
 
-        this.save(qualityInfoDto);
         arrivalStockRecordsService.updateById(arrivalStockRecords);
         arrivalStockRecordsDetailsService.updateBatchById(arrivalStockRecordsDetailsList);
 

hx-victoriatourist/src/main/resources/mapper/quality/QualityInfoMapper.xml

@@ -26,6 +26,7 @@
             p.`code` purchaseCode,
             p.supply_id,
             json_unquote( sw.victoriatourist_json -> '$.deliverGoodsId' ) deliverGoodsId,
+            json_unquote( p.victoriatourist_json -> '$.contractCode' ) contractCode,
             dg.logistics_company_code,
             dg.`code` logisticsCode,
             p.create_user purchaseUserId,

hx-wms/src/main/java/com/fjhx/wms/controller/warehouse/WarehouseLocationInfoController.java

@@ -0,0 +1,44 @@
+package com.fjhx.wms.controller.warehouse;
+
+import com.fjhx.wms.entity.warehouse.po.WarehouseLocationInfo;
+import org.springframework.web.bind.annotation.*;
+import com.fjhx.wms.entity.warehouse.vo.WarehouseLocationInfoVo;
+import com.fjhx.wms.entity.warehouse.dto.WarehouseLocationInfoSelectDto;
+import com.fjhx.wms.entity.warehouse.dto.WarehouseLocationInfoDto;
+import com.fjhx.wms.service.warehouse.WarehouseLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 仓库库位信息 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-18
+ */
+@RestController
+@RequestMapping("/warehouseLocationInfo")
+public class WarehouseLocationInfoController {
+
+    @Autowired
+    private WarehouseLocationInfoService warehouseLocationInfoService;
+
+    /**
+     * 仓库库位信息列表
+     */
+    @PostMapping("/list")
+    public List<WarehouseLocationInfoVo> list(@RequestBody WarehouseLocationInfoDto dto) {
+        return warehouseLocationInfoService.getList(dto);
+    }
+
+    /**
+     * 仓库库位信息编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody WarehouseLocationInfoDto warehouseLocationInfoDto) {
+        warehouseLocationInfoService.edit(warehouseLocationInfoDto);
+    }
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/warehouse/dto/WarehouseLocationInfoDto.java

@@ -0,0 +1,24 @@
+package com.fjhx.wms.entity.warehouse.dto;
+
+import com.fjhx.wms.entity.warehouse.po.WarehouseLocationInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 仓库库位信息新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-18
+ */
+@Getter
+@Setter
+public class WarehouseLocationInfoDto extends WarehouseLocationInfo {
+
+    /**
+     * 库位信息列表
+     */
+    List<WarehouseLocationInfo> warehouseLocationInfoList;
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/warehouse/dto/WarehouseLocationInfoSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.wms.entity.warehouse.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 仓库库位信息列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-18
+ */
+@Getter
+@Setter
+public class WarehouseLocationInfoSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,42 @@
+package com.fjhx.wms.entity.warehouse.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 仓库库位信息
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-18
+ */
+@Getter
+@Setter
+@TableName("warehouse_location_info")
+public class WarehouseLocationInfo extends BasePo {
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * 库位编号
+     */
+    private String code;
+
+    /**
+     * 库位名称
+     */
+    private String name;
+
+    /**
+     * 产品id列表逗号分隔
+     */
+    private String productIds;
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/warehouse/vo/WarehouseLocationInfoVo.java

@@ -0,0 +1,25 @@
+package com.fjhx.wms.entity.warehouse.vo;
+
+import com.fjhx.item.entity.product.po.ProductInfo;
+import com.fjhx.wms.entity.warehouse.po.WarehouseLocationInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 仓库库位信息列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-18
+ */
+@Getter
+@Setter
+public class WarehouseLocationInfoVo extends WarehouseLocationInfo {
+
+    /**
+     * 产品列表
+     */
+    List<ProductInfo> productInfoList;
+
+}

hx-wms/src/main/java/com/fjhx/wms/mapper/warehouse/WarehouseLocationInfoMapper.java

@@ -0,0 +1,22 @@
+package com.fjhx.wms.mapper.warehouse;
+
+import com.fjhx.wms.entity.warehouse.po.WarehouseLocationInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.wms.entity.warehouse.vo.WarehouseLocationInfoVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 仓库库位信息 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-18
+ */
+public interface WarehouseLocationInfoMapper extends BaseMapper<WarehouseLocationInfo> {
+
+
+}

hx-wms/src/main/java/com/fjhx/wms/service/warehouse/WarehouseLocationInfoService.java

@@ -0,0 +1,31 @@
+package com.fjhx.wms.service.warehouse;
+
+import com.fjhx.wms.entity.warehouse.po.WarehouseLocationInfo;
+import com.ruoyi.common.core.service.BaseService;
+import com.fjhx.wms.entity.warehouse.vo.WarehouseLocationInfoVo;
+import com.fjhx.wms.entity.warehouse.dto.WarehouseLocationInfoSelectDto;
+import com.fjhx.wms.entity.warehouse.dto.WarehouseLocationInfoDto;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 仓库库位信息 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-18
+ */
+public interface WarehouseLocationInfoService extends BaseService<WarehouseLocationInfo> {
+
+    /**
+     * 仓库库位信息列表
+     */
+    List<WarehouseLocationInfoVo> getList(WarehouseLocationInfoDto dto);
+
+    /**
+     * 仓库库位信息编辑
+     */
+    void edit(WarehouseLocationInfoDto warehouseLocationInfoDto);
+
+}

hx-wms/src/main/java/com/fjhx/wms/service/warehouse/impl/WarehouseLocationInfoServiceImpl.java

@@ -0,0 +1,54 @@
+package com.fjhx.wms.service.warehouse.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.item.entity.product.po.ProductInfo;
+import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.wms.entity.warehouse.dto.WarehouseLocationInfoDto;
+import com.fjhx.wms.entity.warehouse.po.WarehouseLocationInfo;
+import com.fjhx.wms.entity.warehouse.vo.WarehouseLocationInfoVo;
+import com.fjhx.wms.mapper.warehouse.WarehouseLocationInfoMapper;
+import com.fjhx.wms.service.warehouse.WarehouseLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 仓库库位信息 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-05-18
+ */
+@Service
+public class WarehouseLocationInfoServiceImpl extends ServiceImpl<WarehouseLocationInfoMapper, WarehouseLocationInfo> implements WarehouseLocationInfoService {
+
+    @Autowired
+    private ProductInfoService productInfoService;
+
+    @Override
+    public List<WarehouseLocationInfoVo> getList(WarehouseLocationInfoDto dto) {
+        List<WarehouseLocationInfo> list = list(q -> q.eq(WarehouseLocationInfo::getWarehouseId, dto.getWarehouseId()));
+        List<WarehouseLocationInfoVo> warehouseLocationInfoVos = BeanUtil.copyToList(list, WarehouseLocationInfoVo.class);
+        for (WarehouseLocationInfoVo warehouseLocationInfoVo : warehouseLocationInfoVos) {
+            String productIds = warehouseLocationInfoVo.getProductIds();
+            if (ObjectUtil.isNotEmpty(productIds)) {
+                String[] split = productIds.split(",");
+                List<ProductInfo> productInfoList = productInfoService.list(q -> q.in(ProductInfo::getId, split));
+                warehouseLocationInfoVo.setProductInfoList(productInfoList);
+            }
+        }
+        return warehouseLocationInfoVos;
+    }
+
+    @Override
+    public void edit(WarehouseLocationInfoDto warehouseLocationInfoDto) {
+        List<WarehouseLocationInfo> warehouseLocationInfoList = warehouseLocationInfoDto.getWarehouseLocationInfoList();
+        warehouseLocationInfoList.forEach(item -> item.setWarehouseId(warehouseLocationInfoDto.getWarehouseId()));
+        this.editLinked(warehouseLocationInfoList, WarehouseLocationInfo::getWarehouseId, warehouseLocationInfoDto.getWarehouseId());
+    }
+
+}

hx-wms/src/main/resources/mapper/warehouse/WarehouseLocationInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.wms.mapper.warehouse.WarehouseLocationInfoMapper">
+
+</mapper>