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:
USER-20220102CG\noblelift
2023-09-03 10:56:41 +08:00
parent 14dbaccdf5 40b892b7e6
commit 8231d6d622
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
View File

@@ -336,6 +336,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
sub_jo.put("posnr", json.getString("POSNR"));
sub_jo.put("quanlity_in_box", 1);
sub_jo.put("package_box_sn", package_box_sn);
sub_jo.put("sale_order_name", sale_order_name);
sub_jo.put("width", width);
sub_jo.put("length", length);
sub_jo.put("status", "0");

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

@@ -25,9 +25,9 @@ public class AutoQueryBillInfo {
String nofity_day = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("NOFITY_DAY").getValue();
JSONArray send_rows = new JSONArray();
if (Integer.parseInt(nofity_day) == 0) {
send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND stor_code = 'AC01' AND upload_sap = '0' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '')").getResultJSONArray(0);
send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND confirm_time > '2023-09-01' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '')").getResultJSONArray(0);
} else {
send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND stor_code = 'AC01' AND upload_sap = '0' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '') AND TIMESTAMPDIFF(DAY,confirm_time,NOW()) = " + nofity_day).getResultJSONArray(0);
send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND confirm_time > '2023-09-01' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '') AND TIMESTAMPDIFF(DAY,confirm_time,NOW()) >= " + nofity_day).getResultJSONArray(0);
}
this.sendInfo(send_rows);
}

3
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
View File

@@ -203,7 +203,8 @@ public class InBillQueryServiceImpl implements InBillQueryService {
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("日期", (json.getString("confirm_time_class").substring(0,10)).replace("-","/"));
mp.put("班次", json.getString("classes"));
mp.put("客户代码", json.getString("sale_order_name"));
mp.put("销售订单", json.getString("sale_order_name"));
mp.put("客户编码", json.getString("customer_name"));
mp.put("规格", json.getString("thickness_request"));
mp.put("尺寸（mm）（客户要求幅宽）", json.getString("width_standard"));
mp.put("实际尺寸（mm）（实际幅宽）", json.getString("width"));

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

@@ -38,7 +38,7 @@
</el-select>
</el-form-item>
<!-- <el-form-item label="生成方式">
<!-- <el-form-item label="生成方式">
<el-select
v-model="query.create_mode"
clearable
@@ -194,13 +194,13 @@
</el-button>
<el-button
slot="right"
v-permission="permission.confirm"
class="filter-item"
:loading="loadingConfirm"
type="warning"
:disabled="confirm_flag"
icon="el-icon-check"
size="mini"
v-permission="permission.confirm"
@click="confirm"
>
强制确认
@@ -287,7 +287,7 @@
<el-table-column show-overflow-tooltip label="客户" align="center" prop="cust_simple_name" width="100" />
<el-table-column show-overflow-tooltip label="客户编码" align="center" prop="cust_code" width="100" />
<el-table-column show-overflow-tooltip label="交货单号" align="center" prop="vbeln" width="100" />
<el-table-column show-overflow-tooltip label="是否回传" align="center" prop="is_upload" width="80" :formatter="formatIsUpload"/>
<el-table-column show-overflow-tooltip label="是否回传" align="center" prop="is_upload" width="80" :formatter="formatIsUpload" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
<el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
@@ -306,7 +306,7 @@
<ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
<DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
<TaskDialog :dialog-show.sync="taskShow" :open-array="openParam" :rowmst="mstrow" @TaskChanged="querytable" />
<MoneyDialog :dialog-show.sync="openMoneyDialog" :open-param-money="openParamMoney"/>
<MoneyDialog :dialog-show.sync="openMoneyDialog" :open-param-money="openParamMoney" />
</div>
</template>
@@ -480,6 +480,7 @@ export default {
})
},
outReturn() {
alert('点击确认按钮后，单据进行回传！')
checkoutbill.outReturn({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
this.crud.notify('回传成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.querytable()
@@ -525,7 +526,7 @@ export default {
})
},
downdtl() {
/* const data = {
/* const data = {
'bill_code': this.crud.query.bill_code,
'buss_type': this.crud.query.buss_type,
'io_type': this.crud.query.io_type,