diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java
index 69b18f7f3..50f1f9b2c 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java
@@ -102,4 +102,17 @@ public class BpProcureOrderController extends BaseController
{
return toAjax(bpProcureOrderService.deleteBpProcureOrderByIDs(IDs));
}
+
+
+ /**
+ * 获取白坯原材料采购单详细信息
+ */
+ @GetMapping( "/selectByprocureCode/{procureCode}")
+ public AjaxResult selectByprocureCode(@PathVariable("procureCode") String procureCode)
+ {
+ if (bpProcureOrderService.selectBpProcureOrderByProcureCode(procureCode)==null){
+ return error("采购单不存在");
+ }
+ return success(bpProcureOrderService.selectBpProcureOrderByProcureCode(procureCode));
+ }
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BpProcureOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BpProcureOrder.java
index bfe3e9064..3091704c3 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BpProcureOrder.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BpProcureOrder.java
@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
+import java.util.Date;
+
/**
* 白坯原材料采购单对象 bp_procure_order
*
@@ -48,11 +50,11 @@ public class BpProcureOrder extends BaseEntity
/** 价格 */
@Excel(name = "价格")
- private Long price;
+ private Double price;
/** 用户自定义1 */
@Excel(name = "用户自定义1")
- private String attr1;
+ private Date attr1;
/** 用户自定义2 */
@Excel(name = "用户自定义2")
@@ -142,21 +144,21 @@ public class BpProcureOrder extends BaseEntity
{
return unit;
}
- public void setPrice(Long price)
+ public void setPrice(Double price)
{
this.price = price;
}
- public Long getPrice()
+ public Double getPrice()
{
return price;
}
- public void setAttr1(String attr1)
+ public void setAttr1(Date attr1)
{
this.attr1 = attr1;
}
- public String getAttr1()
+ public Date getAttr1()
{
return attr1;
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BpProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BpProcureOrderMapper.java
index 7648d521f..5bfb17c08 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BpProcureOrderMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BpProcureOrderMapper.java
@@ -58,4 +58,7 @@ public interface BpProcureOrderMapper
* @return 结果
*/
public int deleteBpProcureOrderByIDs(String[] IDs);
+
+// 根据采购单号查询
+ public BpProcureOrder selectBpProcureOrderByProcureCode(String procureCode);
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBpProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBpProcureOrderService.java
index 845d2ffe4..625c95666 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBpProcureOrderService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBpProcureOrderService.java
@@ -1,6 +1,8 @@
package com.op.wms.service;
import java.util.List;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.wms.domain.BpProcureOrder;
/**
@@ -58,4 +60,9 @@ public interface IBpProcureOrderService
* @return 结果
*/
public int deleteBpProcureOrderByID(String ID);
+
+ /*
+ * 根据采购单号查询接口
+ * */
+ BpProcureOrder selectBpProcureOrderByProcureCode(String procureCode);
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java
index e45e9bc71..460c7d896 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpProcureOrderServiceImpl.java
@@ -106,4 +106,13 @@ public class BpProcureOrderServiceImpl implements IBpProcureOrderService
{
return bpProcureOrderMapper.deleteBpProcureOrderByID(ID);
}
+
+ /*
+ * 根据采购单号查询接口
+ * */
+ @Override
+ @DS("#header.poolName")
+ public BpProcureOrder selectBpProcureOrderByProcureCode(String procureCode){
+ return bpProcureOrderMapper.selectBpProcureOrderByProcureCode(procureCode);
+ }
}
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java
index 5f511b524..853db3c6c 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java
@@ -8,8 +8,10 @@ import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.wms.domain.BaseProduct;
+import com.op.wms.domain.BpProcureOrder;
import com.op.wms.domain.BpRawMaterialIn;
import com.op.wms.mapper.BaseProductMapper;
+import com.op.wms.mapper.BpProcureOrderMapper;
import com.op.wms.mapper.BpRawMaterialInMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,6 +38,8 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
private BaseProductMapper baseProductMapper;
@Autowired
private BpRawMaterialInMapper bpRawMaterialInMapper;
+ @Autowired
+ private BpProcureOrderMapper bpProcureOrderMapper;
/**
* 查询白坯原材料入库明细
@@ -112,6 +116,22 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
bpRawMaterialIn.setAmountReal(bpRawMaterialIn.getAmountReal()+bpRawMaterialInDetail.getAmountReal());
bpRawMaterialInMapper.updateBpRawMaterialIn(bpRawMaterialIn);
}
+ //采购单减库存
+ // TODO: 2024-11-11 根据采购单号查询
+ BpProcureOrder bpProcureOrder = bpProcureOrderMapper.selectBpProcureOrderByProcureCode(bpRawMaterialInDetail.getUserDefined1());
+ if (bpProcureOrder==null){
+ reselt=2;
+ return reselt;
+ }else {
+ //采购单减数量
+// BpProcureOrder bpProcureOrder1 = new BpProcureOrder();
+// bpProcureOrder1.setProcureCode(bpRawMaterialInDetail.getUserDefined1());
+// bpProcureOrder1.setMaterialName(bpRawMaterialInDetail.getMaterialName());
+// BaseProduct baseProduct = baseProductMapper.selectBaseProductByProductName(bpRawMaterialInDetail.getMaterialName());
+// bpProcureOrder1.setMaterialCode(baseProduct.getProductCode());
+ bpProcureOrder.setRealityNumber(bpRawMaterialInDetail.getAmountReal());
+ bpProcureOrderMapper.updateBpProcureOrder(bpProcureOrder);
+ }
return reselt;
}
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml
index 91fdf9d5b..e4501f310 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BpProcureOrderMapper.xml
@@ -49,6 +49,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where ID = #{ID}
+
+
insert into bp_procure_order