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

rev:手持成品入库单据列表改分页

Browse Source
This commit is contained in:
zhangzhiqiang
2023-07-25 18:44:06 +08:00
parent 373488ada2
commit de81709cb6
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
View File

@@ -85,10 +85,10 @@
der.is_delete = '0'
AND der.status = '10'
<if test="begin_time != null and begin_time != ''">
and der.create_time &lt;= #{begin_time}
and der.plandeliver_date &lt;= #{begin_time}
</if>
<if test="end_time != null and end_time != ''">
and der.create_time &gt;= #{end_time}
and der.plandeliver_date &gt;= #{end_time}
</if>
<if test="sale_code != null and sale_code != ''">
and der.sale_code LIKE '%${sale_code}%'
@@ -100,7 +100,6 @@
</if>
</where>
</select>
<select id="queryMap" resultType="java.util.Map">
SELECT

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java
View File

@@ -2,8 +2,8 @@ package org.nl.wms.storage_manage.pda.controller;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import org.nl.common.anno.Log;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.pda.service.PdaStCpInService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStCpInService.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.storage_manage.pda.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.domain.query.PageQuery;
/**
* <p>
@@ -33,8 +34,11 @@ public interface PdaStCpInService {
/**
* 查询入库点下拉框
* @param whereJson /
* @param page
* @return JSONObject /
*/
Object getMaterial(JSONObject whereJson, PageQuery page);
JSONObject getMaterial(JSONObject whereJson);
/**

20
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java
View File

@@ -5,6 +5,10 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.modules.system.util.CodeUtil;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
@@ -102,10 +106,24 @@ public class PdaStCpInServiceImpl implements PdaStCpInService {
return result;
}
@Override
public Object getMaterial(JSONObject whereJson, PageQuery page) {
Page<Object> result = PageHelper.startPage(page.getPage()==null?1:page.getPage(), page.getSize()==null?30:page.getPage());
List<Map> list = iMpsSaleOrderService.getPdaMaterial(whereJson);
for (Map map : list) {
Object plandeliver_date = map.get("plandeliver_date");
if (plandeliver_date !=null){
map.put("plandeliver_date",plandeliver_date.toString());
}
}
TableDataInfo build = TableDataInfo.build(list);
build.setTotalElements(result.getTotal());
return build;
}
@Override
public JSONObject getMaterial(JSONObject whereJson) {
List<Map> list = iMpsSaleOrderService.getPdaMaterial(whereJson);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
result.put("message", "查询成功");

2
mes/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: dev3
active: prod
jackson:
time-zone: GMT+8
data: