root/longdianningxing
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
2022-12-02 15:42:43 +08:00
parent 9e1a65abe1 0274838fab
commit 5983d4cfd1
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_CS_TRANSPORAIONL.wql
View File

@@ -68,7 +68,7 @@
IF 输入.flag = "2"
QUERY
SELECT
cust_name AS value,
cust_code AS value,
cust_name AS label
FROM
MD_CS_TransportationBase

9
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -2280,6 +2280,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
// 1.查询此任务是否有任务组
// 2.有任务组：按照执行顺序下发
}
@Override
@@ -2522,6 +2524,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
WQLObject dtlTab = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); // 出入库明细表
WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配明细
WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表
WQLObject tranTab = WQLObject.getWQLObject("MD_CS_TransportationBase"); // 物流公司表
JSONObject jsonMst = mstTab.query("iostorinv_id = '" + MapUtil.getStr(whereJson, "iostorinv_id") + "'").uniqueResult(0);
String cust_code = jsonMst.getString("cust_code");
@@ -2561,7 +2564,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
oneMap.put("receiver", jsonMst.getString("receiver")); // 收货人
oneMap.put("receiptaddress", jsonMst.getString("receiptaddress")); // 收货地址
oneMap.put("receiptphone", jsonMst.getString("receiptphone")); // 收货人联系电话
oneMap.put("logisticscompany", jsonMst.getString("logisticscompany")); // 物流公司
// 物流公司
JSONObject jsonTran = tranTab.query("cust_code = '" + jsonMst.getString("trans_code") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonTran)) {
oneMap.put("logisticscompany", jsonTran.getString("cust_name"));
}
oneMap.put("drivername", jsonMst.getString("drivername")); // 司机
oneMap.put("carno", jsonMst.getString("carno")); // 车牌号
oneMap.put("driverphone", jsonMst.getString("driverphone")); // 司机联系电话

3
lms/nladmin-ui/src/views/wms/st/inStor/check/AddDtl.vue
View File

@@ -80,6 +80,7 @@ import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
name: 'AddDtl',
@@ -132,7 +133,7 @@ export default {
},
methods: {
open() {
crudSectattr.getSect({ is_productstore: '1' }).then(res => {
crudUserStor.getSect({ 'stor_id': '' }).then(res => {
this.sects = res.content
})
this.crud.toQuery()

3
lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDtl.vue
View File

@@ -94,6 +94,7 @@ import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
import handmovestor from '@/views/wms/st/inStor/moveStor/handmovestor'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
export default {
name: 'AddDtl',
@@ -147,7 +148,7 @@ export default {
},
methods: {
open() {
crudSectattr.getSect({ is_materialstore: '1' }).then(res => {
crudUserStor.getSect({ 'stor_id': '' }).then(res => {
this.sects = res.content
})
this.crud.toQuery()