From 3e42139cd2a5e665faef6c5c11bc7f7ca2bfd30d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 二月 2025 10:02:41 +0800
Subject: [PATCH] 修改流程卡打印编辑查询 并查列不匹配问题
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 299 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 265 insertions(+), 34 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index fd66ee6..72ae94d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.entity.userInfo.Log;
@@ -129,11 +130,7 @@
public Boolean updateLayoutStatusSv(String processId, Integer state) {
if (!processId.isEmpty()) {
-// Integer Status = flowCardMapper.selectLayoutStatus(processId);
-
flowCardMapper.updateLayoutStatusMp(processId, state);
-
-
return true;
} else {
return false;
@@ -146,7 +143,6 @@
if (object.get("userName") != null) {
userName = object.get("userName").toString();
}
-
String productionId = "";
if (object.get("productionId") != null) {
productionId = object.get("productionId").toString();
@@ -174,13 +170,12 @@
List<OrderGlassDetail> orderGlassDetailList =
orderGlassDetailMapper.selectList(
new QueryWrapper<OrderGlassDetail>()
- .eq("order_id", flowCard.getProcessId().substring(0, 10))
+ .eq("order_id", orderId)
.eq("order_number", flowCard.getOrderNumber())
);
List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetailList);
orderProcessDetailList.forEach(
orderGlassDetail -> orderGlassDetail.setProcessId(flowCard.getProcessId()));
-
//璧嬪�艰鍗曞伐鑹鸿〃
orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
@@ -207,7 +202,6 @@
map.put("data", flowCardMapper.selectNoSchedulingMp(selectTime1, selectTime2, orderId, processes, flowCard));
}
-
return map;
}
@@ -277,17 +271,21 @@
return null;
}
}
- public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge, String printLike) {
+ public Map<String, Object> getSelectPrintingSv(Map<String, Object> object, String printMerge, String printLike, String merge) {
if (printMerge == null){
printMerge= "";
}
if (printLike == null){
printLike= "";
}
+ if (merge == null){
+ merge= "";
+ }
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
+ Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
//娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
@@ -296,22 +294,35 @@
//鏄惁鍖呭惈鍒囧壊
//boolean containsCutting = flowCard.getProcess().contains("鍒囧壊");
String processSub=flowCard.getProcess().substring(0, 2);
- if(processSub.equals("澶硅兌") || processSub.equals("涓┖")){
+ if(processSub.equals("澶硅兌") || processSub.equals("涓┖")){//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getProcess());
itemmap.put("detailList", detailList);
}
else {
- itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
+ if(merge.equals("1")&& flowCard.getMerge().equals(1)){
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(flowCard.getProcessId())) {
+ continue;
+ }
+ // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
+ processedProcessIds.add(flowCard.getProcessId());
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess());
- itemmap.put("detailList", detailList);
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(),flowCard.getProcess());
+ itemmap.put("detailList", detailList);
+ }else{
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess());
+ itemmap.put("detailList", detailList);
+ }
+
}
}
else {
-
//娴佺▼鍗℃槑缁嗘暟鎹�
if (printLike.equals("")||printLike.equals("null") ){
itemmap.put("detail", flowCardMapper.getPrimaryListMerge(flowCard.getProcessId(), printMerge, flowCard.getOrderId()));
@@ -362,12 +373,16 @@
return map;
}
- public Map<String, Object> getSelectPrintProject(String printProject) {
+ public Map<String, Object> getSelectPrintProject(String printProject,String merge) {
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ if (merge == null){
+ merge= "";
+ }
List<FlowCard> flowCardList = flowCardMapper.getFlowCardListPrintProject(printProject);
if (!flowCardList.isEmpty()) {
+ Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
@@ -389,9 +404,23 @@
else {
if(flowCard.getPatchState().equals(0)){
- itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikes(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess(),printProject,flowCard.getQuantity());
- itemmap.put("detailList", detailList);
+ if(merge.equals("1")&& flowCard.getMerge().equals(1)){
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(flowCard.getProcessId())) {
+ continue;
+ }
+ // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
+ processedProcessIds.add(flowCard.getProcessId());
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
+
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(),flowCard.getProcess());
+ itemmap.put("detailList", detailList);
+ }else{
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess());
+ itemmap.put("detailList", detailList);
+ }
+
}else{
itemmap.put("detail", flowCardMapper.getPrimaryLists(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId(),flowCard.getQuantity()));
List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikes(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess(),printProject,flowCard.getQuantity());
@@ -456,6 +485,20 @@
}
}
+ public Boolean updateProcessCardRack(Map<String, Object> object) {
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ flowCardMapper.updateProcessCardRack(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getRack());
+ }
+ return true;
+ }
+ else {
+ return false;
+
+ }
+ }
+
public Map<String, Object> getSelectPrintLabelSv(String projectNo,String type) {
Map<String, Object> map = new HashMap<>();
if(Objects.equals(type, "1")){
@@ -471,18 +514,13 @@
public Map<String, Object> getSelectPrintLabelSv1(Map<String, Object> object) {
Map<String, Object> map = new HashMap<>();
-
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
- // Integer count=flowCardMapper.getPrintLabelCount(flowCard.getProcessId(), flowCard.getTechnologyNumber());
Map<String, Object> itemmap = new HashMap<>();
- // for (int i = 0; i < count; i++) {
itemmap.put("data", flowCardMapper.getPrintLabel1(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
list.add(itemmap);
- //}
-
}
}
map.put("data", list);
@@ -497,13 +535,9 @@
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
- // Integer count=flowCardMapper.getPrintLabelCount(flowCard.getProcessId(), flowCard.getTechnologyNumber());
Map<String, Object> itemmap = new HashMap<>();
- // for (int i = 0; i < count; i++) {
itemmap.put("data", flowCardMapper.getPrintLabelDetail(flowCard));
list.add(itemmap);
- //}
-
}
}
map.put("data", list);
@@ -521,7 +555,6 @@
List<FlowCard> FlowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
if (!FlowCardList.isEmpty()) {
for (FlowCard flowCard : FlowCardList) {
- // flowCardMapper.printSortMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort());
//鍒ゆ柇淇濆瓨鐨勬暟鎹槸鍚﹀凡瀛樺湪
Integer count = flowCardMapper.printAddSortCountMp(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getTechnologyNumber(),flowCard.getSort(),flowCard.getProcess());
if (count >0){
@@ -542,7 +575,7 @@
if (!flowCardList.isEmpty()) {
Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
- if (lableType != 2){
+ if (lableType != 2){//鎴愬搧鏍囩
for (FlowCard flowCard : flowCardList) {
String processId = flowCard.getProcessId();
@@ -551,14 +584,50 @@
continue;
}
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getOrderNumber()));
list.add(itemmap);
// 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
processedProcessIds.add(processId);
}
}
- else{
+ else{//灏忕墖鏍囩
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
+ list.add(itemmap);
+ }
+ }
+ }
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintCustomLabelSv2(String type, Integer lableType, Map<String, Object> object) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
+
+ if (lableType != 2){//鎴愬搧鏍囩
+ for (FlowCard flowCard : flowCardList) {
+ String processId = flowCard.getProcessId();
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(processId)) {
+ continue;
+ }
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomData2(flowCard.getProcessId()));
+ list.add(itemmap);
+
+ // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
+ processedProcessIds.add(processId);
+ }
+ }
+ else{//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
@@ -739,7 +808,7 @@
if (!flowCardList.isEmpty()) {
Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
- if (lableType != 2){
+ if (lableType != 2){//鎴愬搧鏍囩
for (FlowCard flowCard : flowCardList) {
String processId = flowCard.getProcessId();
String orderNumber = flowCard.getOrderNumber().toString();
@@ -757,7 +826,7 @@
processedProcessIds.add(orderNumber);
}
}
- else{
+ else{//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
@@ -863,6 +932,7 @@
}
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
for (FlowCard flowCard : flowCardList) {
+ //鏌ヨ鏄惁鎶ュ伐
Integer count = flowCardMapper.reportingWorkCount(flowCard.getProcessId());
if (count == 0) {
//淇敼鍒嗘灦鐘舵��
@@ -913,10 +983,12 @@
Set<String> processedProcessIds = new HashSet<>(); // 鐢ㄦ潵瀛樻斁宸插鐞嗚繃鐨� processId
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- if (detailType==0){
+ //鏄惁鏄伐绋嬫槑缁嗘墦鍗�
+ if (detailType==0){//宸ョ▼鎵撳嵃鏄庣粏
itemmap.put("data", flowCardMapper.getPrintCustomDataProjectDetail(flowCard.getProjectNo(),flowCard.getStockId()));
}
+ //闈炲伐绋嬫墦鍗�
else if (detailType==1) {
itemmap.put("data", flowCardMapper.getPrintCustomDataProject(flowCard.getProjectNo()));
@@ -972,6 +1044,165 @@
flowCardMapper.updateProjectProcessPrintCount(projectNo);
return flowCardMapper.selectProjectProcessPrintCount(projectNo);
}
+
+
+ public Map<String, Object> flowCardDetail(Map<String, Object> object) {
+
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("detail", flowCardMapper.getFlowCardDetail(flowCard.getProcessId()));
+ list.add(itemmap);
+
+ }
+ }
+
+ map.put("data", list);
+ return map;
+ }
+
+ public Object processCardAutoRack(Map<String, Object> object) {
+ String orderId = "NG25000004";
+ String productionId = "NG25000004B";
+ /*String orderId = object.get("orderId").toString();
+ String productionId = object.get("productionId").toString();
+ Integer inMaxQuantity = Integer.parseInt(object.get("inMaxQuantity").toString());
+ Float inWeight = Float.parseFloat(object.get("inWeight").toString());
+ Float shelfThickness = Float.parseFloat(object.get("shelfThickness").toString())*1000;
+ Float spacerThickness = Float.parseFloat(object.get("spacerThickness").toString());
+ */
+ Integer inMaxQuantity = 30;
+ Float inWeight = 100.0f;
+ Float shelfThickness = 2000.0f;
+ /*鍨墖鍘氬害*/
+ Float spacerThickness = 0.0f;
+ Map<String,Object> thickness = flowCardMapper.getGlassThicknessByProdutionId(orderId,productionId);
+
+ Float glassTotalThickness = Float.parseFloat(thickness.get("totalThickness").toString()) ;
+ Float glassThickness = Float.parseFloat(thickness.get("thickness").toString());
+
+ //鑾峰彇姝ゅ伐绋嬪彿璁㈠崟鏄庣粏淇℃伅
+ List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId,productionId);
+
+ //鏍规嵁鐜荤拑鍘氬害鍜屽灚鐗囧帤搴﹀綋鍓嶆灦瀛愭渶澶у彲鏀炬暟閲�
+ Integer shelfMaxQuantityByThickness = (int) (shelfThickness / (glassTotalThickness+spacerThickness));
+
+ //鐢ㄤ簬鎺ユ敹鏈�缁堢敓鎴愮殑娴佺▼鍗�
+ List<FlowCard> flowCardList = new ArrayList<>();
+
+ //娴佺▼鍗¤嚜澧炵鍙�
+ int flowCardNo = 1;
+ // 褰撳墠鏋跺瓙鍓╀綑鍙斁鏁伴噺
+ Integer shelfQuantity = 0;
+ for(OrderDetail orderDetail : orderDetails){
+ //鏋跺瓙鏍规嵁灏哄閲嶉噺鏈�澶ц兘鏀惧灏�
+ int shelfQuantityByWeight = (int) (inWeight/
+ (orderDetail.getHeight()
+ *orderDetail.getWidth()
+ *glassThickness
+ *2.5/1000000)
+ );
+ System.out.println(shelfQuantityByWeight);
+ //褰撳墠璁㈠崟鏄庣粏鍓╀綑鏁伴噺
+ if(shelfQuantity==0){
+ shelfQuantity = shelfQuantityByWeight;
+ }
+ //鍙栨渶灏忓��
+ Integer maxQuantity = 0;
+ while (orderDetail.getQuantity() > 0 ) {
+ FlowCard flowCard = new FlowCard();
+ //褰撴寰幆涓紝褰撳墠鏋跺瓙鍓╀綑鏁伴噺涓�0鏃讹紝閲嶆柊璁＄畻鏋跺瓙鍓╀綑鏁伴噺
+ if(shelfQuantity==0){
+ shelfQuantity = shelfQuantityByWeight;
+ System.out.println("flowCardNo锛�"+flowCardNo);
+ }
+ String processId = productionId+String.format("%05d",flowCardNo);
+ //鍙栨渶灏忓��
+ maxQuantity = Math.min(shelfQuantity, Math.min(inMaxQuantity, shelfMaxQuantityByThickness));
+ System.out.println(shelfQuantity+","+inMaxQuantity+","+shelfMaxQuantityByThickness);
+ System.out.println(flowCardNo+","+maxQuantity);
+ System.out.println("------");
+
+ if (orderDetail.getQuantity() > maxQuantity){
+ flowCard.setProcessId(processId);
+ flowCard.setQuantity(maxQuantity);
+ flowCardList.add(flowCard);
+ orderDetail.setQuantity(orderDetail.getQuantity()-maxQuantity);
+ flowCardNo+=1;
+ }else{
+ flowCard.setProcessId(processId);
+ flowCard.setQuantity(Math.toIntExact(orderDetail.getQuantity()));
+ flowCardList.add(flowCard);
+ //褰撳墠鏋跺瓙鍓╀綑鏁伴噺
+ shelfQuantity= shelfQuantity-Math.toIntExact(orderDetail.getQuantity());
+ if(shelfQuantity==0){
+ flowCardNo+=1;
+ }
+ orderDetail.setQuantity(0L);
+ }
+ }
+
+ }
+
+
+
+ return flowCardList;
+ }
+
+
+
+ public Object processCardAutoRack1(Map<String, Object> object) {
+ String orderId = "NG25000004";
+ String productionId = "NG25000004B";
+ /*String orderId = object.get("orderId").toString();
+ String productionId = object.get("productionId").toString();
+ Integer inMaxQuantity = Integer.parseInt(object.get("inMaxQuantity").toString());
+ Float inWeight = Float.parseFloat(object.get("inWeight").toString());
+ Float shelfThickness = Float.parseFloat(object.get("shelfThickness").toString())*1000;
+ Float spacerThickness = Float.parseFloat(object.get("spacerThickness").toString());
+ */
+ Integer inMaxQuantity = 30;
+ Float inWeight = 100.0f;
+ Float shelfThickness = 2000.0f;
+ /*鍨墖鍘氬害*/
+ Float spacerThickness = 0.0f;
+ Map<String,Object> thickness = flowCardMapper.getGlassThicknessByProdutionId(orderId,productionId);
+
+ Float glassTotalThickness = Float.parseFloat(thickness.get("totalThickness").toString()) ;
+ Float glassThickness = Float.parseFloat(thickness.get("thickness").toString());
+
+ //鑾峰彇姝ゅ伐绋嬪彿璁㈠崟鏄庣粏淇℃伅
+ List<OrderDetail> orderDetails = flowCardMapper.getOrderDetailByProductionId(orderId,productionId);
+ Integer flowCardQuantity = 0;
+ for(OrderDetail orderDetail:orderDetails){
+ flowCardQuantity+=Math.toIntExact(orderDetail.getQuantity());
+ }
+
+
+ //鏍规嵁鐜荤拑鍘氬害鍜屽灚鐗囧帤搴﹀綋鍓嶆灦瀛愭渶澶у彲鏀炬暟閲�
+ Integer shelfMaxQuantityByThickness = (int) (shelfThickness / (glassTotalThickness+spacerThickness));
+
+ //鐢ㄤ簬鎺ユ敹鏈�缁堢敓鎴愮殑娴佺▼鍗�
+ List<FlowCard> flowCardList = new ArrayList<>();
+
+ //娴佺▼鍗¤嚜澧炵鍙�
+ int flowCardNo = 1;
+ // 褰撳墠鏋跺瓙鍓╀綑鍙斁鏁伴噺
+ Integer shelfQuantity = 0;
+
+ while(flowCardQuantity>0){
+
+ }
+
+
+
+
+ return flowCardList;
+ }
}
--
Gitblit v1.8.0