root/nl_sanqi_wms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: 给前端的测试分支；

Browse Source
This commit is contained in:
gongbaoxiong
2024-05-29 23:21:27 +08:00
parent 899d41e888
commit 2c72d603d2
10 changed files with 60 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nlsso-server/src/main/java/org/nl/common/enums/wms/EasBillTypeEnum.java
View File

@@ -20,7 +20,11 @@ public enum EasBillTypeEnum {
WWRKD(9, "委外入库", "WWRKD"),
IN(10, "入库", "IN"),
OUT(11, "出库", "OUT"),
OTHER(12, "其他", "12");
OTHER(12, "其他", "12"),
SHDJ(13, "收货确认", "SHDJ"),
DBQR(14, "调拨确认", "DBQR"),
DB(15, "调拨", "DB"),
SH(16, "收货", "SH");
private int index;
private String name;

14
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/AllocationBill2.java
View File

@@ -78,6 +78,11 @@ public class AllocationBill2 extends Model<AllocationBill2> {
*/
private String dcckbm;
/**
* 调出仓库编码
*/
private String dcckmc;
/**
* 调出库位编码
@@ -90,6 +95,11 @@ public class AllocationBill2 extends Model<AllocationBill2> {
*/
private String drckbm;
/**
* 调入仓库编码
*/
private String drckmc;
/**
* 调入库位编码
@@ -97,6 +107,8 @@ public class AllocationBill2 extends Model<AllocationBill2> {
private String drkwbm;
/**
* 计划调入日期
*/
@@ -112,7 +124,7 @@ public class AllocationBill2 extends Model<AllocationBill2> {
/**
* 备注
*/
private String bz;
private String flbz;
/**

5
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/ReceiptBill2.java
View File

@@ -59,6 +59,11 @@ public class ReceiptBill2 extends Model<ReceiptBill2> {
*/
private String ckbm;
/**
* 收货仓库名称
*/
private String ckmc;
/**
* 收货库位编码

4
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/AllocationBillMapper.java
View File

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface AllocationBillMapper extends BaseMapper<AllocationBill> {
@Select("SELECT COUNT(*) FROM receiptBill")
@Select("SELECT COUNT(1) FROM receipt_bill2")
//@DS("oracle_eas")
Long getAllocationCount();
@@ -28,6 +28,6 @@ public interface AllocationBillMapper extends BaseMapper<AllocationBill> {
// @DS("oracle_eas")
Long getTotalCount(@Param("djbh") String djbh);
Page<AllocationBill> allocationDetailPage(Page<AllocationBill> page, @Param("djbh") String djbh, @Param("fuzzy") String fuzzy);
Page<AllocationBill> allocationDetailPage(Page<AllocationBill> page, @Param("djid") String djid, @Param("fuzzy") String fuzzy);
}

2
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/mapper/ReceiptBillMapper.java
View File

@@ -17,5 +17,5 @@ public interface ReceiptBillMapper extends BaseMapper<ReceiptBill> {
Page<ReceiptBill> receiptPage(Page<ReceiptBill> page, @Param("fuzzy") String fuzzy);
//@DS("mysql_srm")
Page<ReceiptBill> receiptDetailPage(Page<ReceiptBill> page, @Param("djbh") String djbh, @Param("fuzzy") String fuzzy);
Page<ReceiptBill> receiptDetailPage(Page<ReceiptBill> page, @Param("djid") String djid, @Param("fuzzy") String fuzzy);
}

23
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml
View File

@@ -42,27 +42,18 @@
WHERE <![CDATA[ row_num > #{size} * (#{page} - 1) ]]>
</select>
<select id="allocationPage" resultType="org.nl.wms.database.eas.dao.AllocationBill">
SELECT *
FROM allocation_bill
<if test="fuzzy != null and fuzzy != ''">
WHERE djbh LIKE CONCAT('%', #{fuzzy}, '%')
OR wlmc LIKE CONCAT('%', #{fuzzy}, '%')
OR ggxh LIKE CONCAT('%', #{fuzzy}, '%')
OR jldw LIKE CONCAT('%', #{fuzzy}, '%')
OR sl LIKE CONCAT('%', #{fuzzy}, '%')
OR kclx LIKE CONCAT('%', #{fuzzy}, '%')
OR kczt LIKE CONCAT('%', #{fuzzy}, '%')
OR ywrq LIKE CONCAT('%', #{fuzzy}, '%')
</if>
GROUP BY
djid
ORDER BY cjsj DESC
SELECT
*
FROM
allocation_bill2
ORDER BY
cjsj DESC
</select>
<select id="allocationDetailPage" resultType="org.nl.wms.database.eas.dao.AllocationBill">
SELECT *
FROM allocation_bill
WHERE djbh = #{djbh}
WHERE djid = #{djid}
<!-- <if test="fuzzy != null and fuzzy != ''">-->
<!-- AND (-->
<!-- djbh LIKE CONCAT('%', #{fuzzy}, '%')-->

6
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/ReceiptBillMapper.xml
View File

@@ -3,7 +3,7 @@
<mapper namespace="org.nl.wms.database.eas.dao.mapper.ReceiptBillMapper">
<select id="receiptPage" resultType="org.nl.wms.database.eas.dao.ReceiptBill">
SELECT *
FROM receipt_bill
FROM receipt_bill2
<if test="fuzzy != null and fuzzy != ''">
WHERE djbh LIKE CONCAT('%', #{fuzzy}, '%')
OR wlmc LIKE CONCAT('%', #{fuzzy}, '%')
@@ -12,14 +12,12 @@
OR ywrq LIKE CONCAT('%', #{fuzzy}, '%')
OR bz LIKE CONCAT('%', #{fuzzy}, '%')
</if>
GROUP BY
djid
ORDER BY tjsj DESC
</select>
<select id="receiptDetailPage" resultType="org.nl.wms.database.eas.dao.ReceiptBill">
SELECT *
FROM receipt_bill
WHERE djbh = #{djbh}
WHERE djid = #{djid}
<!-- <if test="fuzzy != null and fuzzy != ''">-->
<!-- AND (-->
<!-- djbh LIKE CONCAT('%', #{fuzzy}, '%')-->

9
nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
View File

@@ -60,11 +60,10 @@ public class AllocationBillServiceImpl extends ServiceImpl<AllocationBillMapper,
@SaIgnore
public CommonPage<AllocationBill> allocationPage(AllocationBillQuery params) {
// 查询总记录数
// long totalCount = allocationBillMapper.getAllocationCount();
long totalCount = allocationBillMapper.getAllocationCount();
Page<AllocationBill> pageObject = new Page<>(params.getPage(), params.getSize());
Page<AllocationBill> allocationBills = allocationBillMapper.allocationPage(pageObject, params.getFuzzy());
return CommonPage.getPage(allocationBills);
//return CommonPage.getPage(allocationBills, totalCount);
return CommonPage.getPage(allocationBills, totalCount);
}
@@ -75,13 +74,13 @@ public class AllocationBillServiceImpl extends ServiceImpl<AllocationBillMapper,
*/
@Override
public CommonPage<AllocationBill> page(AllocationBillQuery params) {
if (StringUtils.isBlank(params.getDjbh())) {
if (StringUtils.isBlank(params.getDjid())) {
throw new BadRequestException("单据编号不能为空");
}
// 查询总记录数
// long totalCount = allocationBillMapper.getTotalCount(params.getDjbh());
Page<AllocationBill> pageObject = new Page<>(params.getPage(), params.getSize());
Page<AllocationBill> allocationBills = allocationBillMapper.allocationDetailPage(pageObject, params.getDjbh(), params.getFuzzy());
Page<AllocationBill> allocationBills = allocationBillMapper.allocationDetailPage(pageObject, params.getDjid(), params.getFuzzy());
List<AllocationBill> allocationBillList = allocationBills.getRecords();
if (!allocationBillList.isEmpty()) {
// 获取更新列表

20
nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.apache.commons.collections4.CollectionUtils;
import org.nl.common.base.CommonPage;
import org.nl.common.enums.wms.EasBillTypeEnum;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.IdUtil;
@@ -78,7 +79,24 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas
*/
@Override
public List<HomeBillCounts> getBillsCount() {
return easOutInBillMapper.getBillsCount();
List<HomeBillCounts> allCounts =easOutInBillMapper.getBillsCount();
HomeBillCounts allocations =new HomeBillCounts();
Long allocation =26L;
allocations.setCounts(allocation.toString());
allocations.setName(EasBillTypeEnum.DBQR.getName());
allocations.setDjlx(EasBillTypeEnum.DBQR.getCode());
allocations.setYwlx(EasBillTypeEnum.DB.getCode());
HomeBillCounts receipts =new HomeBillCounts();
Long receipt = 6L;
receipts.setCounts(receipt.toString());
receipts.setName(EasBillTypeEnum.SHDJ.getName());
receipts.setDjlx(EasBillTypeEnum.SHDJ.getCode());
receipts.setYwlx(EasBillTypeEnum.SH.getCode());
allCounts.add(allocations);
allCounts.add(receipts);
return allCounts;
}
/**

4
nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/ReceiptBillServiceImpl.java
View File

@@ -73,11 +73,11 @@ public class ReceiptBillServiceImpl extends ServiceImpl<ReceiptBillMapper, Recei
*/
@Override
public CommonPage<ReceiptBill> page(ReceiptBillVO params) {
if (StringUtils.isBlank(params.getDjbh())) {
if (StringUtils.isBlank(params.getDjid())) {
throw new BadRequestException("单据编号不能为空");
}
Page<ReceiptBill> pageObject = new Page<>(params.getPage(), params.getSize());
Page<ReceiptBill> receiptBills = receiptBillMapper.receiptDetailPage(pageObject, params.getDjbh(), params.getFuzzy());
Page<ReceiptBill> receiptBills = receiptBillMapper.receiptDetailPage(pageObject, params.getDjid(), params.getFuzzy());
List<ReceiptBill> receiptBillList = receiptBills.getRecords();
if (!receiptBillList.isEmpty()) {
List<ReceiptBill2> updateList = receiptBill2Mapper.selectList(