From 3631219246be48aec1e745e94e5b28ff4e8799c8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 19:35:54 +0800
Subject: [PATCH] 调整上海原版接口
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js | 161 +++++++++++++++++++++++++++++++----------------------
1 files changed, 95 insertions(+), 66 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
index 69a988a..a29212c 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
@@ -1,54 +1,82 @@
-
/**
* 鎵撳嵃鍑哄簱杩囩鍗�
*/
-printBill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- LODOP.SET_PRINT_PAGESIZE(1,2100,1400, "A4");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
+printBill = function (htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("绉伴噸鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 2100, 1400, "A4");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
};
-print5016Bill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
+print5016Bill = function (htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("绉伴噸鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
+};
+
+/**
+ * 鎵撳嵃璐ㄦ鍗�
+ */
+printCheckBill = function (htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("璐ㄦ鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT", "Full-Page");
+ LODOP.PREVIEW();
+};
+print5016CheckBill = function (htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("璐ㄦ鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "A4");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
};
//鎵撳嵃鎵︽牱鍗�
-printCheck = function(){
- $alert("鎵撳嵃妯＄増鏈畾涔夆�︹��");
+printCheck = function () {
+ var data = view.get("#dsMain.data");
+ if (!data) return;
+ var companyId = data.get("companyId");
+ console.log(companyId);
+ view.get("#ajaxPrintCheckBill").set("parameter", data).execute(function (result) {
+ if (companyId && companyId == "5016") {
+ print5016ShipBill(result);
+ } else {
+ printCheckBill(result);
+ }
+ });
};
//鎵撳嵃绉伴噸鍗�
-printWeight = function(){
- var data = view.get("#dsMain.data");
- if(!data) return;
- var companyId = data.get("companyId");
- console.log(companyId);
- view.get("#ajaxPrint").set("parameter",data).execute(function(result){
- if(companyId && companyId == "5016"){
- print5016Bill(result);
- }else {
- printBill(result);
- }
- });
+printWeight = function () {
+ var data = view.get("#dsMain.data");
+ if (!data) return;
+ var companyId = data.get("companyId");
+ console.log(companyId);
+ view.get("#ajaxPrint").set("parameter", data).execute(function (result) {
+ if (companyId && companyId == "5016") {
+ print5016Bill(result);
+ } else {
+ printBill(result);
+ }
+ });
};
//@Bind #tabControlMain.onTabChange
-!function(self,arg){
- var tab = arg.newTab;
- var data = view.get("#dsMain.data");
- if(tab.get("name") == 'tabCheck' && data.get('type') == 'OUT' ){
- view.get("#tabCheck").set("disabled",true);
- $notify("鍑哄簱琛ュ崟锛屼笉鎻愪氦璐ㄦ淇℃伅");
- }else{
- view.get("#tabCheck").set("disabled",false);
- }
+!function (self, arg) {
+ var tab = arg.newTab;
+ var data = view.get("#dsMain.data");
+ if (tab.get("name") == 'tabCheck' && data.get('type') == 'OUT') {
+ view.get("#tabCheck").set("disabled", true);
+ $notify("鍑哄簱琛ュ崟锛屼笉鎻愪氦璐ㄦ淇℃伅");
+ } else {
+ view.get("#tabCheck").set("disabled", false);
+ }
};
@@ -56,38 +84,39 @@
* 鑷姩璁＄畻
* @param name
*/
-deAutoByWeight = function(name){
-
- if(null == name) name = "1";
-
- var curData = view.get("#dsMain.data:#");
- var fullWeight = curData.get("fullWeight");
- var emptyWeight = curData.get("emptyWeight");
-
- if(fullWeight == 0 || emptyWeight == 0){
- return;
- }
- // 鍑�閲�
- var netWeight = Number(fullWeight) - Number(emptyWeight);
-
- if (netWeight <= 0){
- $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
- return;
- }
-
- //鎵ｉ噸淇℃伅
- var deHandle = curData.get("deHandle"), deCheck = curData.get("deCheck"), dePackage = curData.get("dePackage"), addCheck = curData.get("addCheck");
-
- var deSum = Number(deHandle) + Number(deCheck) + Number(dePackage);
-
-
+deAutoByWeight = function (name) {
+
+ if (null == name) name = "1";
+
+ var curData = view.get("#dsMain.data:#");
+ var fullWeight = curData.get("fullWeight");
+ var emptyWeight = curData.get("emptyWeight");
+
+ if (fullWeight == 0 || emptyWeight == 0) {
+ return;
+ }
+ // 鍑�閲�
+ var netWeight = Number(fullWeight) - Number(emptyWeight);
+
+ if (netWeight <= 0) {
+ $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+ return;
+ }
+
+ //鎵ｉ噸淇℃伅
+ var deHandle = curData.get("deHandle"), deCheck = curData.get("deCheck"), dePackage = curData.get("dePackage"),
+ addCheck = curData.get("addCheck");
+
+ var deSum = Number(deHandle) + Number(deCheck) + Number(dePackage);
+
+
/** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
recordWeight = Number(netWeight) - Number(deSum);
-
+
/** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
settleWeight = Number(netWeight) - Number(deSum) + Number(addCheck);
-
- curData.set("netWeight",netWeight);
- curData.set("settleWeight",settleWeight);
- curData.set("recordWeight",recordWeight);
+
+ curData.set("netWeight", netWeight);
+ curData.set("settleWeight", settleWeight);
+ curData.set("recordWeight", recordWeight);
};
\ No newline at end of file
--
Gitblit v1.9.3