From a87bc77cf3c2548a11038ea0a5e3a628923972d5 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 10 Jun 2025 10:50:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=81=94=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../check/stockcheck/domain/CheckStockin.java | 197 +----------------- .../service/impl/CheckStockinServiceImpl.java | 9 +- .../impl/CheckStockinDetailServiceImpl.java | 6 +- .../CheckStockinDetailFinishServiceImpl.java | 6 +- .../service/impl/InStockinServiceImpl.java | 1 + .../impl/InStockinDetailServiceImpl.java | 7 +- .../InStockinDetailFinishServiceImpl.java | 7 +- .../impl/MydoJobDetailServiceImpl.java | 4 +- .../impl/MydoJobDetailFinishServiceImpl.java | 4 +- .../domain/ViewProductAndStock.java | 35 ++-- .../impl/ReceiveStockinDetailServiceImpl.java | 6 +- ...ReceiveStockinDetailFinishServiceImpl.java | 7 +- .../check/CheckStockinDetailFinishMapper.xml | 75 ++++--- .../mapper/check/CheckStockinDetailMapper.xml | 75 ++++--- .../mapper/check/CheckStockinFinishMapper.xml | 7 +- .../mapper/check/CheckStockinMapper.xml | 8 +- .../mapper/in/InStockinDetailFinishMapper.xml | 133 +++++++----- .../mapper/in/InStockinDetailMapper.xml | 79 ++++--- .../mapper/job/MydoJobDetailFinishMapper.xml | 108 +++++++--- .../mapper/job/MydoJobDetailMapper.xml | 97 ++++++--- .../mapper/out/ViewProductAndStockMapper.xml | 13 +- .../ReceiveStockinDetailFinishMapper.xml | 69 +++--- .../receive/ReceiveStockinDetailMapper.xml | 70 ++++--- ruoyi-ui/src/lang/en.js | 3 +- ruoyi-ui/src/lang/zh.js | 11 +- ruoyi-ui/src/views/check/create/index.vue | 32 +-- ruoyi-ui/src/views/check/stockCheck/index.vue | 6 +- ruoyi-ui/src/views/in/receive/index.vue | 11 +- ruoyi-ui/src/views/in/stockIn/index.vue | 10 +- ruoyi-ui/src/views/stock/freeze/index.vue | 10 +- 30 files changed, 561 insertions(+), 545 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java index dcaa0e8..072e5ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/domain/CheckStockin.java @@ -1,5 +1,8 @@ package com.ruoyi.check.stockcheck.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -7,10 +10,13 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 盘库单据主信息对象 check_stockin - * + * * @author ruoyi * @date 2025-05-29 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class CheckStockin extends BaseEntity { private static final long serialVersionUID = 1L; @@ -41,6 +47,7 @@ public class CheckStockin extends BaseEntity /** 仓库ID */ @Excel(name = "仓库ID") private String warehouseId; + private String warehouseName; /** 完成日期 */ @Excel(name = " 完成日期") @@ -90,195 +97,7 @@ public class CheckStockin extends BaseEntity @Excel(name = "备用字段5") private String spare5; - public void setStockGuid(String stockGuid) - { - this.stockGuid = stockGuid; - } - public String getStockGuid() - { - return stockGuid; - } - - public void setStockCheckId(String stockCheckId) - { - this.stockCheckId = stockCheckId; - } - - public String getStockCheckId() - { - return stockCheckId; - } - - public void setCheckType(String checkType) - { - this.checkType = checkType; - } - - public String getCheckType() - { - return checkType; - } - - public void setCreateDate(String createDate) - { - this.createDate = createDate; - } - - public String getCreateDate() - { - return createDate; - } - - public void setCreateManId(String createManId) - { - this.createManId = createManId; - } - - public String getCreateManId() - { - return createManId; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getStatus() - { - return status; - } - - public void setWarehouseId(String warehouseId) - { - this.warehouseId = warehouseId; - } - - public String getWarehouseId() - { - return warehouseId; - } - - public void setFinishDate(String finishDate) - { - this.finishDate = finishDate; - } - - public String getFinishDate() - { - return finishDate; - } - - public void setErpBill(String erpBill) - { - this.erpBill = erpBill; - } - - public String getErpBill() - { - return erpBill; - } - - public void setStockSource(String stockSource) - { - this.stockSource = stockSource; - } - - public String getStockSource() - { - return stockSource; - } - - public void setDepartmentNo(String departmentNo) - { - this.departmentNo = departmentNo; - } - - public String getDepartmentNo() - { - return departmentNo; - } - - public void setCustomerNo(String customerNo) - { - this.customerNo = customerNo; - } - - public String getCustomerNo() - { - return customerNo; - } - - public void setClassNo(String classNo) - { - this.classNo = classNo; - } - - public String getClassNo() - { - return classNo; - } - - public void setSupplierNo(String supplierNo) - { - this.supplierNo = supplierNo; - } - - public String getSupplierNo() - { - return supplierNo; - } - - public void setSpare1(String spare1) - { - this.spare1 = spare1; - } - - public String getSpare1() - { - return spare1; - } - - public void setSpare2(String spare2) - { - this.spare2 = spare2; - } - - public String getSpare2() - { - return spare2; - } - - public void setSpare3(String spare3) - { - this.spare3 = spare3; - } - - public String getSpare3() - { - return spare3; - } - - public void setSpare4(String spare4) - { - this.spare4 = spare4; - } - - public String getSpare4() - { - return spare4; - } - - public void setSpare5(String spare5) - { - this.spare5 = spare5; - } - - public String getSpare5() - { - return spare5; - } @Override public String toString() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java index 5f8236f..f9e0096 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java @@ -6,6 +6,7 @@ import java.util.Date; import java.util.List; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import com.ruoyi.bas.BasProduct.domain.BasProduct; import com.ruoyi.bas.BasProduct.service.IBasProductService; @@ -14,6 +15,7 @@ import com.ruoyi.check.stockcheck.domain.CheckStockVo; import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail; import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.UUID; import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.in.stockindetail.domain.InStockinDetail; @@ -127,6 +129,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService } private void insertCheckStockinHistory(CheckStockin checkStockin) { + checkStockin = selectCheckStockinByStockGuid(checkStockin.getStockGuid()); //插入历史单据 checkStockinMapper.insertCheckStockinHistory(checkStockin); checkStockinDetailService.insertCheckStockinDetailHistory(checkStockin); @@ -163,12 +166,12 @@ public class CheckStockinServiceImpl implements ICheckStockinService public String saveBill(CheckStockVo checkStockVo) { CheckStockin checkStockin = checkStockVo.getCheckStockin(); List detailList = checkStockVo.getDetailList(); - String stockCheckId = basJobIdService.getJobId("CKD"); + String stockCheckId = basJobIdService.getJobId("PDD"); checkStockin.setStockCheckId(stockCheckId); checkStockin.setStockGuid(IdUtil.simpleUUID()); checkStockin.setCreateDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - String username = SecurityContextHolder.getContext().getAuthentication().getName(); - checkStockin.setCreateManId(username); + checkStockin.setCreateManId(SecurityUtils.getUsername()); + checkStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId())); checkStockin.setStatus("1"); checkStockin.setStockSource("0"); checkStockin.setCheckType(checkStockin.getCheckType()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java index e779c05..65a543c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/service/impl/CheckStockinDetailServiceImpl.java @@ -45,11 +45,7 @@ public class CheckStockinDetailServiceImpl implements ICheckStockinDetailService @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - List checkStockinDetails = checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); - for (CheckStockinDetail stockinDetail : checkStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return checkStockinDetails; + return checkStockinDetailMapper.selectCheckStockinDetailList(checkStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java index b7b39bc..9596338 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java @@ -97,10 +97,6 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF @Override public List selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) { - List checkStockinDetails = checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); - for (CheckStockinDetail stockinDetail : checkStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return checkStockinDetails; + return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java index ebeccb9..0142f01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java @@ -116,6 +116,7 @@ public class InStockinServiceImpl implements IInStockinService * @param inStockin */ private void insertInStockinHistory(InStockin inStockin) { + inStockin = selectInStockinByStockinGuid(inStockin.getStockinGuid()); //插入历史单据 inStockinMapper.insertInStockinHistory(inStockin); iInStockinDetailService.insertInStockinDetailHistory(inStockin); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java index 248e913..fdacc26 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java @@ -46,11 +46,10 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService @Override public List selectInStockinDetailList(InStockinDetail inStockinDetail) { - List inStockinDetails = inStockinDetailMapper.selectInStockinDetailList(inStockinDetail); - for (InStockinDetail res : inStockinDetails) { + /*for (InStockinDetail res : inStockinDetails) { res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return inStockinDetails; + }*/ + return inStockinDetailMapper.selectInStockinDetailList(inStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java index c196f9e..da82b7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java @@ -97,11 +97,8 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS @Override public List selectInStockinDetailList(InStockinDetail inStockinDetail) { - List inStockinDetails = inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail); - for (InStockinDetail res : inStockinDetails) { - res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return inStockinDetails; + + return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java index bfe8514..588e4fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java @@ -46,11 +46,11 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService public List selectMydoJobDetailList(MydoJobDetail mydoJobDetail) { List mydoJobDetails = mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail); - for (MydoJobDetail jobDetail : mydoJobDetails) { + /*for (MydoJobDetail jobDetail : mydoJobDetails) { if (StrUtil.isNotEmpty(jobDetail.getSpare1())){ jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class)); } - } + }*/ return mydoJobDetails; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java index c1cfe24..128b96e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java @@ -54,11 +54,11 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi String jobId = mydoJobDetail.getJobId(); List mydoJobDetails = mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId); - for (MydoJobDetail jobDetail : mydoJobDetails) { + /*for (MydoJobDetail jobDetail : mydoJobDetails) { if (StrUtil.isNotEmpty(jobDetail.getSpare1())){ jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class)); } - } + }*/ return mydoJobDetails; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java index 28bb073..c93a929 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/productAndStock/domain/ViewProductAndStock.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 可出库的库存物资信息对象 view_product_and_stock - * + * * @author ruoyi * @date 2025-05-21 */ @@ -38,63 +38,72 @@ public class ViewProductAndStock extends BaseEntity /** 仓库 */ @Excel(name = "仓库") private String warehouseId; + private String warehouseName; - public void setOnlyIdentity(Long onlyIdentity) + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public void setOnlyIdentity(Long onlyIdentity) { this.onlyIdentity = onlyIdentity; } - public Long getOnlyIdentity() + public Long getOnlyIdentity() { return onlyIdentity; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setProductName(String productName) + public void setProductName(String productName) { this.productName = productName; } - public String getProductName() + public String getProductName() { return productName; } - public void setQuantity(String quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public String getQuantity() + public String getQuantity() { return quantity; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java index 9071e4f..4e3dfa7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java @@ -48,11 +48,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer @Override public List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) { - List receiveStockinDetails = receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail); - for (ReceiveStockinDetail stockinDetail : receiveStockinDetails) { - stockinDetail.setExtraField(JSONUtil.toBean(stockinDetail.getSpare1(), ExtraField.class)); - } - return receiveStockinDetails; + return receiveStockinDetailMapper.selectReceiveStockinDetailList(receiveStockinDetail); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java index 45a0230..6b6de0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java @@ -98,10 +98,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet @Override public List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) { - List receiveStockinDetails = receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail); - for (ReceiveStockinDetail res : receiveStockinDetails) { - res.setExtraField(JSONUtil.toBean(res.getSpare1(), ExtraField.class)); - } - return receiveStockinDetails; + + return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail); } } diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml index 7c45664..fbfb2a2 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml @@ -67,10 +67,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail_finish + select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id, + csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x, + csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec, + csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from check_stockin_detail_finish csd + left join bas_product bp on csd.product_id = bp.product_id @@ -119,34 +136,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="CheckStockinDetailResult"> - and stock_check_guid = #{stockCheckGuid} - and stock_check_id = #{stockCheckId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} + and csd.stock_check_guid = #{stockCheckGuid} + and csd.stock_check_id = #{stockCheckId} + and csd.lot_no = #{lotNo} + and csd.product_guid = #{productGuid} + and csd.product_id = #{productId} + and csd.quantity = #{quantity} + and csd.quantity_x = #{quantityX} + and csd.quantity_j = #{quantityJ} + and csd.price = #{price} + and csd.cargo_no = #{cargoNo} + and csd.assign_num = #{assignNum} + and csd.assign_num_x = #{assignNumX} + and csd.assign_num_j = #{assignNumJ} + and csd.print_date = #{printDate} + and csd.stock_status = #{stockStatus} + and csd.supplier_id = #{supplierId} + and csd.customer_id = #{customerId} + and csd.unit = #{unit} + and csd.spec = #{spec} + and csd.scan_num = #{scanNum} + and csd.scan_num_x = #{scanNumX} + and csd.scan_num_j = #{scanNumJ} + and csd.spare1 = #{spare1} + and csd.spare2 = #{spare2} + and csd.spare3 = #{spare3} + and csd.spare4 = #{spare4} + and csd.spare5 = #{spare5} + and csd.spare6 = #{spare6} diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml index 1c9d3b4..f62a1c0 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml @@ -35,43 +35,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail + select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id, + csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x, + csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec, + csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from check_stockin_detail csd + left join bas_product bp on csd.product_id = bp.product_id diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml index d2c6eff..734d948 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml @@ -45,9 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin_finish + select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, csf.warehouse_id,warehouse_name, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 + from check_stockin_finish csf + left join bas_warehouse bw on bw.warehouse_id= csf.warehouse_id select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish @@ -89,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and create_date = #{createDate} and create_man_id = #{createManId} and status = #{status} - and warehouse_id = #{warehouseId} + and csf.warehouse_id = #{warehouseId} and finish_date = #{finishDate} and erp_bill = #{erpBill} and stock_source = #{stockSource} diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml index 623f79e..ef79447 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml @@ -24,10 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin + select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, cs.warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 , + bw.warehouse_name + from check_stockin cs + left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} + and isd.stockin_guid = #{stockinGuid} + and isd.stockin_id = #{stockinId} + and isd.lot_no = #{lotNo} + and isd.product_guid = #{productGuid} + and isd.product_id = #{productId} + and isd.quantity = #{quantity} + and isd.quantity_x = #{quantityX} + and isd.quantity_j = #{quantityJ} + and isd.price = #{price} + and isd.cargo_no = #{cargoNo} + and isd.assign_num = #{assignNum} + and isd.assign_num_x = #{assignNumX} + and isd.assign_num_j = #{assignNumJ} + and isd.print_date = #{printDate} + and isd.stock_status = #{stockStatus} + and isd.supplier_id = #{supplierId} + and isd.customer_id = #{customerId} + and isd.unit = #{unit} + and isd.spec = #{spec} + and isd.spare1 = #{spare1} + and isd.spare2 = #{spare2} + and isd.spare3 = #{spare3} + and isd.spare4 = #{spare4} + and isd.spare5 = #{spare5} + and isd.spare6 = #{spare6} + and isd.scan_num = #{scanNum} + and isd.scan_num_x = #{scanNumX} + and isd.scan_num_j = #{scanNumJ} @@ -114,34 +133,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="InStockinDetailResult"> - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and scan_num = #{scanNum} - and scan_num_x = #{scanNumX} - and scan_num_j = #{scanNumJ} + and isd.stockin_guid = #{stockinGuid} + and isd.stockin_id = #{stockinId} + and isd.lot_no = #{lotNo} + and isd.product_guid = #{productGuid} + and isd.product_id = #{productId} + and isd.quantity = #{quantity} + and isd.quantity_x = #{quantityX} + and isd.quantity_j = #{quantityJ} + and isd.price = #{price} + and isd.cargo_no = #{cargoNo} + and isd.assign_num = #{assignNum} + and isd.assign_num_x = #{assignNumX} + and isd.assign_num_j = #{assignNumJ} + and isd.print_date = #{printDate} + and isd.stock_status = #{stockStatus} + and isd.supplier_id = #{supplierId} + and isd.customer_id = #{customerId} + and isd.unit = #{unit} + and isd.spec = #{spec} + and isd.spare1 = #{spare1} + and isd.spare2 = #{spare2} + and isd.spare3 = #{spare3} + and isd.spare4 = #{spare4} + and isd.spare5 = #{spare5} + and isd.spare6 = #{spare6} + and isd.scan_num = #{scanNum} + and isd.scan_num_x = #{scanNumX} + and isd.scan_num_j = #{scanNumJ} diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml index 8da7d75..b9180fa 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml @@ -35,14 +35,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stockin_detail_id, stockin_guid, stockin_id, lot_no, isd.product_guid, - isd.product_id, quantity, quantity_x, quantity_j, isd.price, isd.cargo_no, isd.remark, - assign_num, assign_num_x, assign_num_j, print_date, stock_status, - supplier_id, customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, - isd.spare5, isd.spare6, scan_num, scan_num_x, scan_num_j + select + isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid, + isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark, + isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, + isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, + isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, + bp.product_name, bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume from in_stockin_detail isd left join bas_product bp on bp.product_id = isd.product_id @@ -50,34 +63,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml index a1c2c71..3383327 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml @@ -3,8 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -31,41 +31,81 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select job_detail_id, job_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, product_id, stock_status, in_quantity, stock_quantity, out_quantity, layer_quantity, out_layer_quantity, give_num, stockin_id, stacking_id, exit_id, print_date, customer_id, supplier_id, spare1, spare2, spare3, spare4 from mydo_job_detail_finish - + select mjd.job_detail_id, + mjd.job_id, + mjd.stock_id, + mjd.lot_no, + mjd.in_date, + mjd.in_or_out_id, + mjd.in_or_out_d_id, + mjd.product_guid, + mjd.product_id, + mjd.stock_status, + mjd.in_quantity, + mjd.stock_quantity, + mjd.out_quantity, + mjd.layer_quantity, + mjd.out_layer_quantity, + mjd.give_num, + mjd.stockin_id, + mjd.stacking_id, + mjd.exit_id, + mjd.print_date, + mjd.customer_id, + mjd.supplier_id, + mjd.spare1, + mjd.spare2, + mjd.spare3, + mjd.spare4, + bp.product_name, bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + + from mydo_job_detail_finish mjd + left join bas_product bp on mjd.product_id = bp.product_id + @@ -73,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where job_id = #{jobId} - + - and job_detail_id = #{jobDetailId} - and job_id = #{jobId} - and stock_id = #{stockId} - and lot_no = #{lotNo} - and in_date = #{inDate} - and in_or_out_id = #{inOrOutId} - and in_or_out_d_id = #{inOrOutDId} - and product_guid = #{productGuid} - and product_id = #{productId} - and stock_status = #{stockStatus} - and in_quantity = #{inQuantity} - and stock_quantity = #{stockQuantity} - and out_quantity = #{outQuantity} - and layer_quantity = #{layerQuantity} - and out_layer_quantity = #{outLayerQuantity} - and give_num = #{giveNum} - and stockin_id = #{stockinId} - and stacking_id = #{stackingId} - and exit_id = #{exitId} - and print_date = #{printDate} - and customer_id = #{customerId} - and supplier_id = #{supplierId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} + and mjd.job_detail_id = #{jobDetailId} + and mjd.job_id = #{jobId} + and mjd.stock_id = #{stockId} + and mjd.lot_no = #{lotNo} + and mjd.in_date = #{inDate} + and mjd.in_or_out_id = #{inOrOutId} + and mjd.in_or_out_d_id = #{inOrOutDId} + and mjd.product_guid = #{productGuid} + and mjd.product_id = #{productId} + and mjd.stock_status = #{stockStatus} + and mjd.in_quantity = #{inQuantity} + and mjd.stock_quantity = #{stockQuantity} + and mjd.out_quantity = #{outQuantity} + and mjd.layer_quantity = #{layerQuantity} + and mjd.out_layer_quantity = #{outLayerQuantity} + and mjd.give_num = #{giveNum} + and mjd.stockin_id = #{stockinId} + and mjd.stacking_id = #{stackingId} + and mjd.exit_id = #{exitId} + and mjd.print_date = #{printDate} + and mjd.customer_id = #{customerId} + and mjd.supplier_id = #{supplierId} + and mjd.spare1 = #{spare1} + and mjd.spare2 = #{spare2} + and mjd.spare3 = #{spare3} + and mjd.spare4 = #{spare4} + - + and only_identity = #{onlyIdentity} and product_id = #{productId} and lot_no like concat('%', #{lotNo}, '%') @@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and warehouse_id = #{warehouseId} - + - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} + and rsd.stockin_guid = #{stockinGuid} + and rsd.stockin_id = #{stockinId} + and rsd.lot_no = #{lotNo} + and rsd.product_guid = #{productGuid} + and rsd.product_id = #{productId} + and rsd.quantity = #{quantity} + and rsd.quantity_x = #{quantityX} + and rsd.quantity_j = #{quantityJ} + and rsd.price = #{price} + and rsd.cargo_no = #{cargoNo} + and rsd.assign_num = #{assignNum} + and rsd.assign_num_x = #{assignNumX} + and rsd.assign_num_j = #{assignNumJ} + and rsd.print_date = #{printDate} + and rsd.stock_status = #{stockStatus} + and rsd.supplier_id = #{supplierId} + and rsd.customer_id = #{customerId} + and rsd.unit = #{unit} + and rsd.spec = #{spec} + and rsd.spare1 = #{spare1} + and rsd.spare2 = #{spare2} + and rsd.spare3 = #{spare3} + and rsd.spare4 = #{spare4} + and rsd.spare5 = #{spare5} + and rsd.spare6 = #{spare6} diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml index fdf6e91..7dd1219 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml @@ -32,41 +32,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + - select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail + select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id, + rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num, + rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id, + rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from receive_stockin_detail rsd + left join bas_product bp on rsd.product_id = bp.product_id