修改备货

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java

@@ -66,6 +66,11 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "订单自编号")
 	private String orderSelfNumbering;
+	/**
+	 * 在库订单ID
+	 */
+	@ApiModelProperty(value = "在库订单ID")
+	private Long stockArticleId;
 	/**
 	 * 入库批次号
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java

@@ -17,12 +17,9 @@
 package com.logpm.distribution.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.time.LocalDate;
 import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
@@ -30,8 +27,8 @@ import org.springblade.core.tenant.mp.TenantEntity;
 /**
  * 备货信息表 实体类
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 @Data
 @TableName("logpm_distribution_stockup")
@@ -43,9 +40,6 @@ public class DistributionStockupEntity extends TenantEntity {
 	 * 备货时间
 	 */
 	@ApiModelProperty(value = "备货时间")
-	@JsonFormat(
-		pattern = "yyyy-MM-dd"
-	)
 	private Date stockupDate;
 	/**
 	 * 备货人
@@ -61,7 +55,7 @@ public class DistributionStockupEntity extends TenantEntity {
 	 * 备货区
 	 */
 	@ApiModelProperty(value = "备货区")
-	private Long goodsAreaId;
+	private String stockupArea;
 	/**
 	 * 指派状态;1-未指派、2-已指派
 	 */
@@ -102,5 +96,30 @@ public class DistributionStockupEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+	/**
+	 * 备货区编号
+	 */
+	@ApiModelProperty(value = "备货区编号")
+	private Long goodsAreaId;
+	/**
+	 * 叉车司机
+	 */
+	@ApiModelProperty(value = "叉车司机")
+	private Long forklift;
+	/**
+	 * 装卸班组
+	 */
+	@ApiModelProperty(value = "装卸班组")
+	private Long loader;
+	/**
+	 * 确认完成备货时间
+	 */
+	@ApiModelProperty(value = "确认完成备货时间")
+	private Date fixTime;
+	/**
+	 * 指派时间
+	 */
+	@ApiModelProperty(value = "指派时间")
+	private Date assignTime;
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java

@@ -25,16 +25,16 @@ import org.springframework.web.bind.annotation.RequestParam;
 /**
  * 备货信息表 Feign接口类
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 @FeignClient(
-    value = "stockup"
+    value = "blade-distributionStockup"
 )
 public interface IDistributionStockupClient {
 
-    String API_PREFIX = "stockup/client";
+    String API_PREFIX = "/client";
-    String TOP = API_PREFIX + "/top";
+    String TOP = API_PREFIX + "/to2p";
 
     /**
      * 获取备货信息表列表
@@ -44,6 +44,6 @@ public interface IDistributionStockupClient {
      * @return BladePage
      */
     @GetMapping(TOP)
-    BladePage<DistributionStockupEntity> stockupTop(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+    BladePage<DistributionStockupEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java

@@ -24,8 +24,8 @@ import lombok.EqualsAndHashCode;
 /**
  * 备货信息表 视图实体类
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -100,6 +100,16 @@ public class DistributionStockArticleController extends BladeController {
 		return R.status(distributionStockArticleService.save(distributionStockArticle));
 	}
 
+	/**
+	 * 配送在库订单 新增
+	 */
+	@PostMapping("/saveStock")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入distributionStockArticle")
+	public R saveStock(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(distributionStockArticleService.saveStock(ids));
+	}
+
 	/**
 	 * 配送在库订单 修改
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java

@@ -47,12 +47,12 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * 备货信息表 控制器
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/stockup")
+@RequestMapping("/distributionStockup")
 @Api(value = "备货信息表", tags = "备货信息表接口")
 public class DistributionStockupController extends BladeController {
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockupDTO.java

@@ -23,8 +23,8 @@ import lombok.EqualsAndHashCode;
 /**
  * 备货信息表 数据传输对象实体类
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupExcel.java

@@ -30,8 +30,8 @@ import java.io.Serializable;
 /**
  * 备货信息表 Excel实体类
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 @Data
 @ColumnWidth(25)
@@ -46,7 +46,7 @@ public class DistributionStockupExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("租户号")
-	private String tenantId;
+	private Long tenantId;
 	/**
 	 * 是否已删除
 	 */
@@ -119,5 +119,35 @@ public class DistributionStockupExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("预留5")
 	private String reserve5;
+	/**
+	 * 备货区编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备货区编号")
+	private Long goodsAreaId;
+	/**
+	 * 叉车司机
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("叉车司机")
+	private Long forklift;
+	/**
+	 * 装卸班组
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("装卸班组")
+	private Long loader;
+	/**
+	 * 确认完成备货时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("确认完成备货时间")
+	private Date fixTime;
+	/**
+	 * 指派时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("指派时间")
+	private Date assignTime;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java

@@ -28,8 +28,8 @@ import java.util.List;
 /**
  * 备货信息表 Mapper 接口
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 public interface DistributionStockupMapper extends BaseMapper<DistributionStockupEntity> {
 
@@ -51,5 +51,4 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 */
 	List<DistributionStockupExcel> exportDistributionStockup(@Param("ew") Wrapper<DistributionStockupEntity> queryWrapper);
 
-
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -4,6 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="distributionStockupResultMap" type="com.logpm.distribution.entity.DistributionStockupEntity">
+        <result column="id" property="id"/>
         <result column="tenant_id" property="tenantId"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>
@@ -12,21 +13,25 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="create_dept" property="createDept"/>
-        <result column="id" property="id"/>
         <result column="stockup_date" property="stockupDate"/>
         <result column="stockup_user" property="stockupUser"/>
         <result column="stockup_status" property="stockupStatus"/>
-        <result column="goods_area_id" property="goodsAreaId"/>
+        <result column="stockup_area" property="stockupArea"/>
         <result column="assign_status" property="assignStatus"/>
         <result column="stockip_allocation" property="stockipAllocation"/>
-<!--        <result column="reservation_id" property="reservationId"/>-->
         <result column="reserve1" property="reserve1"/>
         <result column="reserve2" property="reserve2"/>
         <result column="reserve3" property="reserve3"/>
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
+        <result column="goods_area_id" property="goodsAreaId"/>
+        <result column="forklift" property="forklift"/>
+        <result column="loader" property="loader"/>
+        <result column="fix_time" property="fixTime"/>
+        <result column="assign_time" property="assignTime"/>
     </resultMap>
 
+
     <select id="selectDistributionStockupPage" resultMap="distributionStockupResultMap">
         select * from logpm_distribution_stockup where is_deleted = 0
     </select>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java

@@ -49,4 +49,5 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	 */
 	List<DistributionStockArticleExcel> exportDistributionStockArticle(Wrapper<DistributionStockArticleEntity> queryWrapper);
 
+    Boolean saveStock(String ids);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java

@@ -27,8 +27,8 @@ import java.util.List;
 /**
  * 备货信息表 服务类
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 public interface IDistributionStockupService extends BaseService<DistributionStockupEntity> {
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -17,16 +17,22 @@
 package com.logpm.distribution.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.entity.DistributionStockListEntity;
+import com.logpm.distribution.service.IDistributionStockListService;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.mapper.DistributionStockArticleMapper;
 import com.logpm.distribution.service.IDistributionStockArticleService;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
 import java.util.List;
 
 /**
@@ -35,10 +41,13 @@ import java.util.List;
  * @author cyz
  * @since 2023-06-13
  */
+@Slf4j
 @Service
 @AllArgsConstructor
 public class DistributionStockArticleServiceImpl extends BaseServiceImpl<DistributionStockArticleMapper, DistributionStockArticleEntity> implements IDistributionStockArticleService {
 
+	private final IDistributionStockListService distributionStockListService;
+
 	@Override
 	public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) {
 		return page.setRecords(baseMapper.selectDistributionStockArticlePage(page, distributionStockArticle));
@@ -54,4 +63,44 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return distributionStockArticleList;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean saveStock(String ids) {
+		try{
+			if(StringUtils.isNotBlank(ids)){
+				String[] split = ids.split(",");
+				for (String s : split) {
+					//查询在库订单信息
+					DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.selectById(s);
+					//添加库存品
+					DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
+					distributionStockListEntity.setStockArticleId(Long.parseLong(s));
+					distributionStockListEntity.setOrderSelfNumbering(distributionStockArticleEntity.getOrderSelfNumbering());
+//			distributionStockListEntity.setIncomingBatch(); //入库批次号
+					distributionStockListEntity.setDescriptionGoods(distributionStockArticleEntity.getDescriptionGoods());
+//			distributionStockListEntity.setCargoNumber(); //货物编号
+					distributionStockListEntity.setWarehouse(distributionStockArticleEntity.getWarehouse());
+//			distributionStockListEntity.setMarket(); //商场
+//			distributionStockListEntity.setCargoUnit(distributionStockArticleEntity.get); //货物单位
+//			distributionStockListEntity.setShop(); //门店
+//			distributionStockListEntity.setStorageLocation(); //库位信息
+					distributionStockListEntity.setMallName(distributionStockArticleEntity.getMallName());
+					distributionStockListEntity.setQuantityStock(distributionStockArticleEntity.getHandQuantity());
+					distributionStockListEntity.setOutboundQuantity(distributionStockArticleEntity.getHandQuantity());
+//			distributionStockListEntity.setDespatch(distributionStockArticleEntity.get);//车次号
+					distributionStockListService.save(distributionStockListEntity);
+					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+					stockArticleEntity.setId(distributionStockArticleEntity.getId());
+					stockArticleEntity.setGenre(2);
+					baseMapper.updateById(stockArticleEntity);
+				}
+				return true;
+			}
+			return false;
+		}catch (Exception e){
+			log.info("异常",e.getMessage());
+			return null;
+		}
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java

@@ -21,6 +21,7 @@ import com.logpm.distribution.vo.DistributionStockListVO;
 import com.logpm.distribution.excel.DistributionStockListExcel;
 import com.logpm.distribution.mapper.DistributionStockListMapper;
 import com.logpm.distribution.service.IDistributionStockListService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +35,7 @@ import java.util.List;
  * @since 2023-06-15
  */
 @Service
+@AllArgsConstructor
 public class DistributionStockListServiceImpl extends BaseServiceImpl<DistributionStockListMapper, DistributionStockListEntity> implements IDistributionStockListService {
 
 	@Override

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -30,8 +30,8 @@ import java.util.List;
 /**
  * 备货信息表 服务实现类
  *
- * @author Tjj
+ * @author cyz
- * @since 2023-06-14
+ * @since 2023-06-15
  */
 @Service
 public class DistributionStockupServiceImpl extends BaseServiceImpl<DistributionStockupMapper, DistributionStockupEntity> implements IDistributionStockupService {