From b2ee05eb9357bf9d2441a10abc267bc234708f2a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 14:53:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/stores/sd/companySet/温州巨星.js | 2 +
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 16 +++++++-
north-glass-erp/northglass-erp/src/stores/sd/companySet/金华天成.js | 4 +
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue | 1
north-glass-erp/src/main/java/com/example/erp/controller/AppController.java | 4 ++
north-glass-erp/northglass-erp/src/stores/sd/companySet/上海北玻.js | 2 +
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue | 1
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 6 ++-
north-glass-erp/northglass-erp/src/stores/sd/companySet/洛阳北玻.js | 2 +
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 4 +
north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js | 2 +
north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js | 2 +
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 5 ++
north-glass-erp/northglass-erp/src/stores/sd/companySet/天津北玻.js | 2 +
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 30 +++++++++-----
15 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue
index f003444..07d3814 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelProject.vue
@@ -79,7 +79,6 @@
props.lastList.push(list.value[i].data[j])
}
}
- console.log(props)
} else {
ElMessage.warning(res.msg)
router.push("/login")
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
index ed0d8cb..1db48b7 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
@@ -110,7 +110,6 @@
}
}
}
- console.log(props)
} else {
ElMessage.warning(res.msg)
}
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 4791d3a..64a6757 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -168,7 +168,17 @@
//姣忎釜搴忓彿闈㈢Н
collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
totalArea = add(totalArea, collection.total_area)
- totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+ //鏍规嵁鏈夊嚑灞傝绠楅噸閲�
+ for (let j = 0; j < produceList.value[i].detail.length; j++) {
+ if (produceList.value[i].detail[j].technologyNumber.length>1){
+ totalWeight += collection.weight * collection.quantity * 1;
+
+ }else {
+ totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+
+ }
+ }
+
//姣忎釜搴忓彿鍛ㄩ暱
collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
});
@@ -359,7 +369,9 @@
<td class="tdNowrap">鍗曠墖鍚嶇О锛�</td>
<td colspan="3">{{ itemTr.glass_child }}</td>
<td class="tdNowrap">浜у搧鍚嶇О锛�</td>
- <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+
+ <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
+ <td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
</tr>
<tr>
<td rowspan='2'>搴忓彿</td>
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
index 38f0a79..bfb77bd 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\344\270\212\346\265\267\345\214\227\347\216\273.js"
@@ -23,6 +23,8 @@
msg:'basicData.msg.range99999Dec2'
},
orderIdType:'day',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+ orderIdTypeLetter:'NG',//璁㈠崟鍙峰墠闈㈠瓧姣�
+ orderIdTypeMantissa:2,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁� orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
deliveryIdType:'day',
deliveryDate:15,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
columnName:'鍥惧彿',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
index 607506d..aac7b2c 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
@@ -23,6 +23,8 @@
msg:'basicData.msg.range99999Dec2'
},
orderIdType:'year',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+ orderIdTypeLetter:'NG',//璁㈠崟鍙峰墠闈㈠瓧姣�
+ orderIdTypeMantissa:2,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁� orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
deliveryIdType:'day',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
deliveryDate:7,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
columnName:'鍥惧彿',//鎵撳嵃鐢熶骇鍗曟椂闇�瑕佹樉绀虹殑鍒楀悕锛屾病鏈変负绌�
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
index 84e435a..9cb5376 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
@@ -23,6 +23,8 @@
msg:'basicData.msg.range9999Dec'
},
orderIdType:'month',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
+ orderIdTypeLetter:'NG',//璁㈠崟鍙峰墠闈㈠瓧姣�
+ orderIdTypeMantissa:2,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁� orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
deliveryIdType:'month',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
deliveryDate:7,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
columnName:'寮傚舰鍙傛暟',//鎵撳嵃鐢熶骇鍗曟椂闇�瑕佹樉绀虹殑鍒楀悕锛屾病鏈変负绌�
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
index e686a1e..d91432e 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
@@ -23,6 +23,8 @@
msg:'basicData.msg.range99999Dec2'
},
orderIdType:'year',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:鎸夊勾鐢熸垚
+ orderIdTypeLetter:'NG',//璁㈠崟鍙峰墠闈㈠瓧姣�
+ orderIdTypeMantissa:2,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁� orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
deliveryIdType:'day',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
deliveryDate:15,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
columnName:'鍥惧彿',//鎵撳嵃鐢熶骇鍗曟椂闇�瑕佹樉绀虹殑鍒楀悕锛屾病鏈変负绌�
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
index a803204..4d43dde 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\264\233\351\230\263\345\214\227\347\216\273.js"
@@ -23,6 +23,8 @@
msg:'basicData.msg.range99999Dec2'
},
orderIdType:'day',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+ orderIdTypeLetter:'NG',//璁㈠崟鍙峰墠闈㈠瓧姣�
+ orderIdTypeMantissa:2,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁� orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
deliveryIdType:'day',
deliveryDate:15,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
columnName:'鍥惧彿',
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
index 64f34e4..44e1fbb 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\270\251\345\267\236\345\267\250\346\230\237.js"
@@ -23,6 +23,8 @@
msg:'basicData.msg.range99999Dec2'
},
orderIdType:'day',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+ orderIdTypeLetter:'NG',//璁㈠崟鍙峰墠闈㈠瓧姣�
+ orderIdTypeMantissa:2,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁� orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
deliveryIdType:'day',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
deliveryDate:15,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
columnName:'鍥惧彿',//鎵撳嵃鐢熶骇鍗曟椂闇�瑕佹樉绀虹殑鍒楀悕锛屾病鏈変负绌�
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
index f62b7c0..3aa51c4 100644
--- "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\351\207\221\345\215\216\345\244\251\346\210\220.js"
@@ -22,7 +22,9 @@
//regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//姝ｅ垯0.00-9999.99
msg:'basicData.msg.range99999Dec2'
},
- orderIdType:'year',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+ orderIdType:'day',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+ orderIdTypeLetter:'R',//璁㈠崟鍙峰墠闈㈠瓧姣�
+ orderIdTypeMantissa:3,//璁㈠崟鍙峰熬鏁颁繚鐣欎綅鏁� orderIdTypeLetter闀垮害+orderIdTypeMantissa =4
deliveryIdType:'day',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
deliveryDate:15,//璁㈠崟鍒涘缓閫佽揣鏃ユ湡 澶╂触7澶╋紝甯稿窞7澶╋紝涔変箤15澶╋紝鏂扮枂15澶�
columnName:'鍥惧彿',//鎵撳嵃鐢熶骇鍗曟椂闇�瑕佹樉绀虹殑鍒楀悕锛屾病鏈変负绌�
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 9ba8da4..47d70ab 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -899,7 +899,10 @@
}
}
}
+
+const brokenGridKey = ref(0)
const openedBrokenTable = async () => {
+ brokenGridKey.value++
await nextTick()
console.log('breakageType:', titleSelectJson.value.breakageType)
console.log('breakageReason:', titleSelectJson.value.breakageReason)
@@ -1893,7 +1896,7 @@
+brokenRow.glass_child+'.'+brokenRow.order_number+'.'+brokenRow.technology_number"
style="width: 80%;height:75% ">
<vxe-grid
-
+ :key="brokenGridKey"
height="400px"
ref="brokenGrid"
class="mytable-scrollbar"
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index a579d0d..0b6cb66 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -401,7 +401,9 @@
creator:userStore.user.userName,
creatorId:userStore.user.userId,
newOrderId:newOrderId.value,
- position:company.position
+ position:company.position,
+ orderIdTypeLetter:company.orderIdTypeLetter,
+ orderIdTypeMantissa:company.orderIdTypeMantissa
}
const grossAreaList = $grid.getTableData().fullData.filter(
item=>item.grossArea === 0
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
index cb889b9..38f1f81 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/AppController.java
@@ -67,12 +67,14 @@
@ApiOperation("鍙叆搴撶殑鎴愬搧鏌ヨ鎺ュ彛")
@PostMapping("/getSelectWarehousingList")
+ @SaCheckPermission("createProductStock.search")
public Result getSelectWarehousingList(@RequestBody Map<String,String> map){
return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(map.get("processId")));
}
@ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
@PostMapping("/addSelectWarehousing")
+ @SaCheckPermission("createProductStock.add")
public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));
@@ -80,12 +82,14 @@
@ApiOperation("鍙彂璐х殑鎴愬搧鏌ヨ鎺ュ彛")
@PostMapping("/getSelectDeliveryDetailList")
+ @SaCheckPermission("finishedProductOut.search")
public Result getSelectDeliveryDetailList(){
return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetailApp());
}
@ApiOperation("鎴愬搧鍑哄簱鎺ュ彛")
@PostMapping("/addDeliveryDetail")
+ @SaCheckPermission("finishedProductOut.add")
public Result addDeliveryDetail( @RequestBody Map<String,Object> object){
return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 1ce87df..5b8c0fe 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -29,7 +29,6 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.sql.SQLOutput;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -67,6 +66,8 @@
public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
JSONObject orderJson = new JSONObject(orderMap);
String orderIdType = orderJson.getString("orderIdType");
+ String orderIdTypeLetter = orderJson.getString("orderIdTypeLetter");
+ Integer orderIdTypeMantissa = orderJson.getInteger("orderIdTypeMantissa");
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("otherMoney")), OrderOtherMoney.class);
@@ -85,7 +86,12 @@
log.setContent(orderMap.toString());
if(order.getOrderId() == null || order.getOrderId().isEmpty()){
- insertOrder(order,OrderDetails,orderOtherMoneyList,orderIdType, (Map<String, String>) orderMap.get("position"));
+ insertOrder(order,
+ OrderDetails,orderOtherMoneyList,orderIdType,
+ (Map<String, String>) orderMap.get("position"),
+ orderIdTypeLetter,
+ orderIdTypeMantissa
+ );
log.setFunction("saveOrder鍒涘缓:"+order.getOrderId());
}else {
updateOrder(order,OrderDetails,orderOtherMoneyList,(Map<String, String>) orderMap.get("position"));
@@ -165,9 +171,9 @@
return map;
}
//鐢熸垚璁㈠崟鏁版嵁
- public void insertOrder(Order order, List<OrderDetail> OrderDetails, List<OrderOtherMoney> orderOtherMoneyList, String orderIdType, Map<String,String> position) {
+ public void insertOrder(Order order, List<OrderDetail> OrderDetails, List<OrderOtherMoney> orderOtherMoneyList, String orderIdType, Map<String,String> position, String orderIdTypeLetter, Integer orderIdTypeMantissa) {
//鏍规嵁浼犲叆鐨勫綋鍓嶆湀浠芥垨鑰呭綋澶╃敓鎴愯鍗昳d
- String orderId = getOrderId(orderIdType);
+ String orderId = getOrderId(orderIdType,orderIdTypeLetter,orderIdTypeMantissa);
//寰�涓昏〃鎻掓暟鎹�
order.setOrderId(orderId);
order.setCreateOrder(2);
@@ -175,32 +181,34 @@
insertOtherDetail(orderId,OrderDetails,orderOtherMoneyList,position);
}
- private String getOrderId(String dateType){
+ private String getOrderId(String dateType, String orderIdTypeLetter, Integer orderIdTypeMantissa){
String orderId = null;
+ Integer orderIdTypeLetterLen = orderIdTypeLetter.length();
+ Integer count = orderIdTypeLetterLen+orderIdTypeMantissa;
if(dateType==null || dateType.equals("day")){
Integer maxOrderId = orderMapper.selectMaxOrderId();
//鏌ヨ璁㈠崟id锛屽苟涓旇嚜澧�
- String formattedNumber = String.format("%02d", maxOrderId+1);
+ String formattedNumber = String.format("%0"+orderIdTypeMantissa+"d", maxOrderId+1);
//鏍煎紡鍖栧綋鍓嶆棩鏈�
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
String formattedDate = dateFormat.format(currentDate);
- orderId = "NG"+formattedDate+formattedNumber;
+ orderId = orderIdTypeLetter+formattedDate+formattedNumber;
}else if(dateType.equals("month")){
Integer maxOrderId = orderMapper.selectMaxOrderIdByMonth();
- String formattedNumber = String.format("%04d", maxOrderId+1);
+ String formattedNumber = String.format("%0"+(orderIdTypeMantissa+2)+"d", maxOrderId+1);
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyMM");
String formattedDate = dateFormat.format(currentDate);
- orderId = "NG"+formattedDate+formattedNumber;
+ orderId = orderIdTypeLetter+formattedDate+formattedNumber;
}else if(dateType.equals("year")){
Integer maxOrderId = orderMapper.selectMaxOrderIdByYear();
- String formattedNumber = String.format("%06d", maxOrderId+1);
+ String formattedNumber = String.format("%"+(orderIdTypeMantissa+4)+"d", maxOrderId+1);
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yy");
String formattedDate = dateFormat.format(currentDate);
- orderId = "NG"+formattedDate+formattedNumber;
+ orderId = orderIdTypeLetter+formattedDate+formattedNumber;
}
return orderId;
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index db97e93..cea4d1c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -808,7 +808,8 @@
pd.separation,
fc.technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ od.weight
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -3559,7 +3560,8 @@
pd.separation,
#{compound} as technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
- od.building_number
+ od.building_number,
+ od.weight
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
--
Gitblit v1.8.0