diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
index 7cc1ee8..9e6f13c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
@@ -98,6 +98,25 @@ public class InStockin extends BaseEntity
@Excel(name = "备用字段5")
private String spare5;
+ private String lotNo;
+ private String materialDesc;
+
+ public String getLotNo() {
+ return lotNo;
+ }
+
+ public void setLotNo(String lotNo) {
+ this.lotNo = lotNo;
+ }
+
+ public String getMaterialDesc() {
+ return materialDesc;
+ }
+
+ public void setMaterialDesc(String materialDesc) {
+ this.materialDesc = materialDesc;
+ }
+
public String getCreateManName() {
return createManName;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java
index 9ec21d5..92e87ef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java
@@ -102,6 +102,25 @@ public class ReceiveStockin extends BaseEntity
@Excel(name = "供应商名称")
private String supplierName;
+ private String lotNo;
+ private String materialDesc;
+
+ public String getLotNo() {
+ return lotNo;
+ }
+
+ public void setLotNo(String lotNo) {
+ this.lotNo = lotNo;
+ }
+
+ public String getMaterialDesc() {
+ return materialDesc;
+ }
+
+ public void setMaterialDesc(String materialDesc) {
+ this.materialDesc = materialDesc;
+ }
+
public String getCreateManName() {
return createManName;
}
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
index a2aea7b..c01a381 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
@@ -131,6 +131,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and is2.spare3 = #{spare3}
and is2.spare4 = #{spare4}
and is2.spare5 = #{spare5}
+
+ and is2.stockin_id in (
+ select distinct stockin_id from in_stockin_detail_finish isd
+ left join bas_product bp on isd.product_id = bp.product_id
+ where bp.product_name like concat('%',#{materialDesc},'%')
+ )
+
+
+ and is2.stockin_id in (
+ select distinct stockin_id from in_stockin_detail_finish
+ where lot_no like concat('%',#{lotNo},'%')
+ )
+
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
index 84cbd12..7fff78f 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
@@ -82,6 +82,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and is2.spare4 = #{spare4}
and is2.spare3 = #{spare3}
and is2.spare5 = #{spare5}
+
+ and is2.stockin_id in (
+ select distinct stockin_id from in_stockin_detail isd
+ left join bas_product bp on isd.product_id = bp.product_id
+ where bp.product_name like concat('%',#{materialDesc},'%')
+ )
+
+
+ and is2.stockin_id in (
+ select distinct stockin_id from in_stockin_detail
+ where lot_no like concat('%',#{lotNo},'%')
+ )
+
diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
index a5aa259..15ad9f7 100644
--- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
@@ -132,6 +132,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and rs.customer_no = #{customerNo}
and rs.class_no = #{classNo}
and rs.supplier_no = #{supplierNo}
+
+ and rs.stockin_id in (
+ select distinct stockin_id from receive_stockin_detail_finish rsd
+ left join bas_product bp on rsd.product_id = bp.product_id
+ where bp.product_name like concat('%',#{materialDesc},'%')
+ )
+
+
+ and rs.stockin_id in (
+ select distinct stockin_id from receive_stockin_detail_finish rsd
+ where rsd.lot_no like concat('%',#{lotNo},'%')
+ )
+
diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
index 2e9ff07..0ce29cf 100644
--- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
@@ -84,6 +84,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and rs.customer_no = #{customerNo}
and rs.class_no = #{classNo}
and rs.supplier_no = #{supplierNo}
+
+ and rs.stockin_id in (
+ select distinct stockin_id from receive_stockin_detail rsd
+ left join bas_product bp on rsd.product_id = bp.product_id
+ where bp.product_name like concat('%',#{materialDesc},'%')
+ )
+
+
+ and rs.stockin_id in (
+ select distinct stockin_id from receive_stockin_detail rsd
+ where rsd.lot_no like concat('%',#{lotNo},'%')
+ )
+
diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index 3caec43..64cfa8c 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -91,6 +91,8 @@ export default {
status: 'Document Status',
selectStatus: 'Please select document status',
search: 'Search',
+ inputMaterialDesc:'inputMaterialDesc',
+ inputLotNo:'inputLotNo',
reset: 'Reset',
generateStockin: 'Generate Stockin Document',
delet: 'Delete',
@@ -1431,7 +1433,7 @@ export default {
checkPostNameIsNull: 'PostName Can Not Be Null',
checkPostCodeIsNull: 'PostCode Can Not Be Null',
checkPostSortIsNull: 'PostSort Can Not Be Null',
-
+
},
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index cea610b..1b4eb00 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -91,6 +91,8 @@ export default {
inputSupplierNo:'请输入供应商编码',
stockSource:'单据来源',
inputStockSource:'请输入单据来源',
+ inputMaterialDesc:'请输入物料描述',
+ inputLotNo:'请输入批号',
warehouseId:'仓库',
selectWarehouseId:'请选择仓库',
status:'单据状态',
@@ -928,7 +930,7 @@ export default {
checkPostNameIsNull: '岗位名称不能为空',
checkPostCodeIsNull: '岗位编码不能为空',
checkPostSortIsNull: '岗位顺序不能为空',
-
+
},
diff --git a/ruoyi-ui/src/views/in/receive/add/index.vue b/ruoyi-ui/src/views/in/receive/add/index.vue
index 5017224..0f44cb0 100644
--- a/ruoyi-ui/src/views/in/receive/add/index.vue
+++ b/ruoyi-ui/src/views/in/receive/add/index.vue
@@ -67,15 +67,29 @@
-
+
+
+ {{ (scope.row.quantity * scope.row.spare2).toFixed(2) }}
+
+
-
-
+
+
+
+ {{ (scope.row.quantity * scope.row.spare2).toFixed(2) }}
+
+
+
+
+
+ {{ (scope.row.quantity * scope.row.spare2).toFixed(2) }}
+
+
@@ -135,7 +149,7 @@
{{ $t('receiveStockinAdd.submit') }}
- {{ $t('receiveStockinAdd.cancel') }}
+ {{ $t('receiveStockinAdd.cancel') }}
@@ -348,19 +362,8 @@ export default {
calculateTotal() {
this.totalQuantity = this.productList.reduce((sum, item) => sum + (item.quantity || 0), 0);
this.totalAmount = this.productList.reduce((sum, item) => sum + ((item.quantity || 0) * (item.price || 0)), 0);
-
- // 遍历产品列表，计算每个产品的重量
- this.productList.forEach(item => {
- // 计算总净重（单件净重×数量）
- item.totalNetWeight = (item.quantity || 0) * (item.spare2 || 0);
- // 净重等于总净重
- item.netWeight = item.totalNetWeight;
- // 毛重等于总净重
- item.grossWeight = item.totalNetWeight;
- });
-
// 计算表单总计
- this.totalNetWeight = this.productList.reduce((sum, item) => sum + (item.totalNetWeight || 0), 0);
+ this.totalNetWeight = this.productList.reduce((sum, item) => sum + ((item.quantity || 0) * (item.spare2 || 0)), 0);
this.netWeight = this.totalNetWeight;
this.grossWeight = this.totalNetWeight;
@@ -370,6 +373,24 @@ export default {
this.form.netWeight = this.netWeight;
this.form.grossWeight = this.grossWeight;
},
+ cancelPri(){
+ // 重置表单数据
+ this.form = {
+ warehouseId: undefined,
+ supplierId: undefined,
+ remark: undefined,
+ totalQuantity: 0,
+ totalAmount: 0,
+ };
+ // 清空物料列表
+ this.productList = [];
+ // 重置计数器
+ this.totalQuantity = 0;
+ this.totalAmount = 0;
+ // 重置表单校验结果
+ this.$refs["form"].resetFields();
+
+ },
/** 表单提交 */
submitForm() {
this.$refs["form"].validate(valid => {
@@ -415,20 +436,7 @@ export default {
addStockin(data).then(() => {
this.$modal.msgSuccess(this.$t('receiveStockinAdd.addSuccess'));
// 重置表单数据
- this.form = {
- warehouseId: undefined,
- supplierId: undefined,
- remark: undefined,
- totalQuantity: 0,
- totalAmount: 0,
- };
- // 清空物料列表
- this.productList = [];
- // 重置计数器
- this.totalQuantity = 0;
- this.totalAmount = 0;
- // 重置表单校验结果
- this.$refs["form"].resetFields();
+ cancelPri()
});
}
});
@@ -436,6 +444,7 @@ export default {
cancel() {
this.productSelectVisible = false;
},
+
/** 导入按钮操作 */
handleImport() {
this.upload.title = this.$t('receiveStockinAdd.uploadTitle')
@@ -454,7 +463,7 @@ export default {
this.upload.open = false
this.upload.isUploading = false
this.$refs.upload.clearFiles()
- this.$alert("" + response.msg + "
", "导入结果", {dangerouslyUseHTMLString: true});
+ //this.$alert("" + response.msg + "
", "导入结果", {dangerouslyUseHTMLString: true});
if (response.code === 200) {
this.$modal.msgSuccess("导入成功");
this.productList.push(...response.data)
diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue
index dea2b23..038c70c 100644
--- a/ruoyi-ui/src/views/in/receive/index.vue
+++ b/ruoyi-ui/src/views/in/receive/index.vue
@@ -108,18 +108,34 @@
@keyup.enter.native="handleQuery"
/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue
index fe88fee..dee0f16 100644
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -9,6 +9,22 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+