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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-01-11 15:42:24 +08:00
parent 54fe5a6e84 9cd78f0d25
commit 38628e518c
19 changed files with 253 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql
View File

@@ -66,7 +66,7 @@
LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
LEFT JOIN pdm_bi_subpackagerelation sub ON ivt.pcsn = sub.container_name
WHERE
DATEDIFF( NOW(), sub.date_of_production ) >= SUBSTRING_INDEX(sub.quality_guaran_period,'天',1)
DATEDIFF( NOW(), sub.date_of_production ) > SUBSTRING_INDEX(sub.quality_guaran_period,'天',1)
AND ivt.canuse_qty > '0'
GROUP BY attr.stor_id
@@ -107,7 +107,7 @@
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = attr.storagevehicle_code
AND ivt.pcsn = sub.container_name
WHERE
DATEDIFF( NOW(), sub.date_of_production ) < '90'
DATEDIFF( NOW(), sub.date_of_production ) <= '90'
AND ivt.canuse_qty > '0'
GROUP BY attr.stor_id

12
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -336,8 +336,16 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
.map(row -> row.getString("box_no"))
.collect(Collectors.joining("','"));
// 所有子卷
List<JSONObject> disList = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no in ('" + box_no_in + "') and iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0).toJavaList(JSONObject.class);
// 所有分切计划
// String pcsn_in = disList.stream()
// .map(row -> row.getString("pcsn"))
// .collect(Collectors.joining("','"));
// List<JSONObject> planList = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name in ('" + pcsn_in + "')").getResultJSONArray(0).toJavaList(JSONObject.class);
JSONObject param = new JSONObject();
JSONArray item = new JSONArray();
@@ -359,7 +367,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("ContainerName", jsonObject.getString("pcsn"));
jsonObject1.put("NetWeight", jsonObject.getString("plan_qty"));
jsonObject1.put("NetWeight",NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty")));
details.add(jsonObject1);
}
jsonDtl.put("Details", details);
@@ -1552,7 +1560,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("ContainerName", jsonObject.getString("pcsn"));
jsonObject1.put("NetWeight", jsonObject.getString("plan_qty"));
jsonObject1.put("NetWeight", NumberUtil.toStr(jsonObject.getDoubleValue("plan_qty")));
details.add(jsonObject1);
}
jsonDtl.put("Details", details);

20
lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue
View File

@@ -253,13 +253,25 @@ export default {
const end = new Date()
const start = new Date()
const endYear = end.getFullYear()
const endMonth = end.getMonth() + 1
const endDay = end.getDate()
var endMonth = end.getMonth() + 1
if (end.getMonth() + 1 < 10) {
endMonth = '0' + endMonth.toString()
}
var endDay = end.getDate()
if (end.getDate() < 10) {
endDay = '0' + endDay.toString()
}
const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
const startYear = start.getFullYear()
const startMonth = start.getMonth() + 1
const startDay = start.getDate()
var startMonth = start.getMonth() + 1
if (start.getMonth() + 1 < 10) {
startMonth = '0' + startMonth.toString()
}
var startDay = start.getDate()
if (start.getDate() < 10) {
startDay = '0' + startDay.toString()
}
const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
this.$set(this.query, 'createTime', [startDate, endDate])
this.crud.toQuery()

20
lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue
View File

@@ -261,13 +261,25 @@ export default {
const end = new Date()
const start = new Date()
const endYear = end.getFullYear()
const endMonth = end.getMonth() + 1
const endDay = end.getDate()
var endMonth = end.getMonth() + 1
if (end.getMonth() + 1 < 10) {
endMonth = '0' + endMonth.toString()
}
var endDay = end.getDate()
if (end.getDate() < 10) {
endDay = '0' + endDay.toString()
}
const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
const startYear = start.getFullYear()
const startMonth = start.getMonth() + 1
const startDay = start.getDate()
var startMonth = start.getMonth() + 1
if (start.getMonth() + 1 < 10) {
startMonth = '0' + startMonth.toString()
}
var startDay = start.getDate()
if (start.getDate() < 10) {
startDay = '0' + startDay.toString()
}
const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
this.$set(this.query, 'createTime', [startDate, endDate])
this.crud.toQuery()

20
lms/nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -318,13 +318,25 @@ export default {
const end = new Date()
const start = new Date()
const endYear = end.getFullYear()
const endMonth = end.getMonth() + 1
const endDay = end.getDate()
var endMonth = end.getMonth() + 1
if (end.getMonth() + 1 < 10) {
endMonth = '0' + endMonth.toString()
}
var endDay = end.getDate()
if (end.getDate() < 10) {
endDay = '0' + endDay.toString()
}
const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
const startYear = start.getFullYear()
const startMonth = start.getMonth() + 1
const startDay = start.getDate()
var startMonth = start.getMonth() + 1
if (start.getMonth() + 1 < 10) {
startMonth = '0' + startMonth.toString()
}
var startDay = start.getDate()
if (start.getDate() < 10) {
startDay = '0' + startDay.toString()
}
const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
this.$set(this.query, 'createTime', [startDate, endDate])
this.crud.toQuery()

20
lms/nladmin-ui/src/views/wms/st/incharge/index.vue
View File

@@ -217,13 +217,25 @@ export default {
const end = new Date()
const start = new Date()
const endYear = end.getFullYear()
const endMonth = end.getMonth() + 1
const endDay = end.getDate()
var endMonth = end.getMonth() + 1
if (end.getMonth() + 1 < 10) {
endMonth = '0' + endMonth.toString()
}
var endDay = end.getDate()
if (end.getDate() < 10) {
endDay = '0' + endDay.toString()
}
const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
const startYear = start.getFullYear()
const startMonth = start.getMonth() + 1
const startDay = start.getDate()
var startMonth = start.getMonth() + 1
if (start.getMonth() + 1 < 10) {
startMonth = '0' + startMonth.toString()
}
var startDay = start.getDate()
if (start.getDate() < 10) {
startDay = '0' + startDay.toString()
}
const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
this.$set(this.query, 'createTime', [startDate, endDate])
this.crud.toQuery()

24
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -347,6 +347,8 @@ import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
const start = new Date()
export default {
name: 'Checkoutbill',
components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog, TaskDialog, MoneyDialog },
@@ -412,13 +414,25 @@ export default {
const end = new Date()
const start = new Date()
const endYear = end.getFullYear()
const endMonth = end.getMonth() + 1
const endDay = end.getDate()
var endMonth = end.getMonth() + 1
if (end.getMonth() + 1 < 10) {
endMonth = '0' + endMonth.toString()
}
var endDay = end.getDate()
if (end.getDate() < 10) {
endDay = '0' + endDay.toString()
}
const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
const startYear = start.getFullYear()
const startMonth = start.getMonth() + 1
const startDay = start.getDate()
var startMonth = start.getMonth() + 1
if (start.getMonth() + 1 < 10) {
startMonth = '0' + startMonth.toString()
}
var startDay = start.getDate()
if (start.getDate() < 10) {
startDay = '0' + startDay.toString()
}
const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
this.$set(this.query, 'createTime', [startDate, endDate])
this.crud.toQuery()
@@ -466,7 +480,7 @@ export default {
} else {
this.confirm_flag = true
}
if (current.bill_type === '1006' || current.bill_type === '1003' || current.bill_type === '1004') {
if (current.bill_type === '1006' || current.bill_type === '1003') {
this.business_confirm_flag = false
} else {
this.business_confirm_flag = true

20
lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
View File

@@ -223,13 +223,25 @@ export default {
const end = new Date()
const start = new Date()
const endYear = end.getFullYear()
const endMonth = end.getMonth() + 1
const endDay = end.getDate()
var endMonth = end.getMonth() + 1
if (end.getMonth() + 1 < 10) {
endMonth = '0' + endMonth.toString()
}
var endDay = end.getDate()
if (end.getDate() < 10) {
endDay = '0' + endDay.toString()
}
const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
const startYear = start.getFullYear()
const startMonth = start.getMonth() + 1
const startDay = start.getDate()
var startMonth = start.getMonth() + 1
if (start.getMonth() + 1 < 10) {
startMonth = '0' + startMonth.toString()
}
var startDay = start.getDate()
if (start.getDate() < 10) {
startDay = '0' + startDay.toString()
}
const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
this.$set(this.query, 'createTime', [startDate, endDate])
this.crud.toQuery()