仓库管理修改

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java

@@ -2,6 +2,9 @@ package org.springblade.wms.feign;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Date;
 
 /**
  * @version 1.0
@@ -20,10 +23,19 @@ public interface WmsTaskClient {
 
 	String EXECUTE_GOODS_STATUS_UPDATE = API_PREFIX + "/executeGoodsStatusUpdate";
 
+	String BUY_ORDER_APPLY = API_PREFIX + "/buyOrderApply";
+
 	/**
 	 * 物料状态监控同步erp
 	 */
 	@PostMapping(EXECUTE_GOODS_STATUS_UPDATE)
 	boolean executeGoodsStatusUpdate();
 
+	/**
+	 * 额外计划提请
+	 */
+	@PostMapping(BUY_ORDER_APPLY)
+	Long buyOrderApply(@RequestParam("goodsCode")String goodsCode, @RequestParam("buyQty")Double buyQty, @RequestParam("userId")Long userId,
+					   @RequestParam("buyDate")Date buyDate, @RequestParam("checkUserId")Long checkUserId, @RequestParam("checkDate")Date checkDate) throws Exception;
+
 }

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StBuyOrder.java

@@ -179,6 +179,10 @@ public class StBuyOrder extends TenantEntity {
 	 * 已提交
 	 */
 	public static Short BOSTATUS_SUBMIT = 3;
+	/**
+	 * 采购员已审批
+	 */
+	public static Short BOSTATUS_BUY_APPROVED = 4;
 	/**
 	 * 采购中
 	 */

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java

@@ -1,6 +1,7 @@
 package org.springblade.wms.pojo.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.wms.pojo.entity.StGoods;
@@ -25,4 +26,8 @@ public class StGoodsVO extends StGoods {
 	@TableField(exist = false)
 	private Double avlQuantity;
 
+	@TableField(exist = false)
+	@Schema(description = "库房ID（关联st_storehouse表）")
+	private Long shId;
+
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java

@@ -4,9 +4,12 @@ import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.wms.service.IStBuyOrderService;
 import org.springblade.wms.service.IStGoodsExtService;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+
 /**
  * @version 1.0
  * @program: jonhon-mes-svr
@@ -24,9 +27,16 @@ public class WmsTaskClientImpl implements WmsTaskClient{
 
 	private final IStGoodsExtService stGoodsExtService;
 
+	private final IStBuyOrderService stBuyOrderService;
+
 	@Override
 	public boolean executeGoodsStatusUpdate() {
 		stGoodsExtService.executeGoodsStatusUpdate();
 		return true;
 	}
+
+	@Override
+	public Long buyOrderApply(String goodsCode, Double buyQty, Long userId, Date buyDate, Long checkUserId, Date checkDate) throws Exception {
+		return stBuyOrderService.buyOrderApplyFor(goodsCode, buyQty, userId, buyDate, checkUserId, checkDate);
+	}
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java

@@ -43,5 +43,7 @@ public interface StGoodsMapper extends BaseMapper<StGoods> {
 	StGoods queryByCodeAndVersion(@Param("prtno") String prtno, @Param("releaseNo") String releaseNo);
 
 	List<StGoodsVO> selectFindAllGoodsPage(IPage<StGoodsVO> page, StGoodsVO stGoods);
+
+	List<StGoodsVO> queryByShId(IPage<StGoodsVO> page, StGoodsVO stGoods);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml

@@ -106,4 +106,23 @@
         WHERE ROWNUM = 1
     </select>
 
+    <select id="queryByShId" resultType="org.springblade.wms.pojo.vo.StGoodsVO">
+        SELECT t.*, s.sh_id
+        FROM st_goods t
+        INNER JOIN ST_STORAGE_LOCATION s
+        ON t.goods_code = s.goods_code
+        <where>
+            AND t.is_deleted = 0
+            AND t.used = 1
+            <!-- 物料编码模糊查询 -->
+            <if test="stGoods.goodsCode != null and stGoods.goodsCode != ''">
+                AND t.goods_code LIKE '%' || #{stGoods.goodsCode} || '%'
+            </if>
+
+            <if test="stGoods.shId != null and stGoods.shId != ''">
+                AND s.sh_id = #{stGoods.shId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStBuyOrderService.java

@@ -9,6 +9,7 @@ import org.springblade.wms.pojo.dto.StBuyOrderDTO;
 import org.springblade.wms.pojo.entity.StBuyOrder;
 import org.springblade.wms.pojo.vo.StBuyOrderVO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -57,6 +58,8 @@ public interface IStBuyOrderService extends BaseService<StBuyOrder> {
 
     void approvalOrder(Long id, Short approvalResult, BladeUser approver);
 
+	Long buyOrderApplyFor(String goodsCode, Double buyQty, Long userId, Date buyDate, Long checkUserId, Date checkDate) throws Exception;
+
 //	JSONObject otherPlanDetail(Long id, String prtno);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStGoodsService.java

@@ -51,5 +51,7 @@ public interface IStGoodsService extends BaseService<StGoods> {
 	IPage<StGoodsVO> selectFindAllGoodsPage(IPage<StGoodsVO> page, StGoodsVO stGoods);
 
     void addLockQuantity(Long goodsId, double v);
+
+	IPage<StGoodsVO> queryByShId(IPage<StGoodsVO> page, StGoodsVO stGoods);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java

@@ -312,6 +312,41 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 		baseMapper.updateById(oldBuyOrder);
 	}
 
+	@Override
+	public Long buyOrderApplyFor(String goodsCode, Double buyQty, Long userId, Date buyDate, Long checkUserId, Date checkDate) throws Exception{
+
+		StGoods goods = stGoodsService.queryByCode(goodsCode);
+
+		StBuyOrder bo = new StBuyOrder();
+		bo.setBoCode(this.nextCode());
+		bo.setGoodsId(goods.getId());
+		bo.setGrade(goods.getGrade());
+		bo.setBuyMan(userId);
+		User user = userClient.userInfoById(userId).getData();
+		bo.setBuyDept(Long.valueOf(user.getDeptId()));
+		bo.setDeclareMan(userId);
+		bo.setNeedDept(Long.valueOf(user.getDeptId()));
+		bo.setDeclareDate(buyDate);
+		bo.setNeedDate(buyDate);
+		bo.setBoStatus(StBuyOrder.BOSTATUS_NEW);
+		bo.setCreateUser(userId);
+		bo.setCreateTime(buyDate);
+		bo.setBoStatus(StBuyOrder.BOSTATUS_SUBMIT);
+		bo.setPlanArea("洛阳新区");
+		bo.setCheckDate(checkDate);
+		bo.setCheckMan(checkUserId);
+		bo.setBuyQty(buyQty);
+		bo.setApprovalStatus(StBuyOrder.APPROVAL_STATUS_CHECKED);
+
+		this.save(bo);
+
+		List<StBuyOrder> list = new ArrayList<>();
+		list.add(bo);
+		this.purOtherRest(list, userId);
+
+		return bo.getId();
+	}
+
 	public StBuyOrder getByExtraBill(String extraBill) {
 		return baseMapper.getByExtraBill(extraBill);
 	}

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java

@@ -214,5 +214,9 @@ public class StGoodsServiceImpl extends BaseServiceImpl<StGoodsMapper, StGoods>
 		return stGoodsList;
 	}
 
+	@Override
+	public IPage<StGoodsVO> queryByShId(IPage<StGoodsVO> page, StGoodsVO stGoods) {
+		return page.setRecords(baseMapper.queryByShId(page, stGoods));
+	}
 }