| | |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Map<String, Object> getSelectPrintSvs(Map<String, Object> object) { |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//最终结果 |
|---|
| | | List<FinishedOperateLog> finishedOperateLogList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FinishedOperateLog.class); |
|---|
| | | if (!finishedOperateLogList.isEmpty()) { |
|---|
| | | Set<String> processedProcessIds = new HashSet<>(); |
|---|
| | | for (FinishedOperateLog finishedOperateLog : finishedOperateLogList) { |
|---|
| | | String OrderId = finishedOperateLog.getOrderId(); |
|---|
| | | String Remarks = finishedOperateLog.getRemarks(); |
|---|
| | | |
|---|
| | | // 检查是否已经处理过该 OrderId，如果处理过则跳过 |
|---|
| | | if (processedProcessIds.contains(OrderId) && processedProcessIds.contains(Remarks)) { |
|---|
| | | continue; |
|---|
| | | } |
|---|
| | | |
|---|
| | | Map<String, Object> itemmap = new HashMap<>(); |
|---|
| | | itemmap.put("detail", finishedOperateLogMapper.getPrimaryListLimts(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks())); |
|---|
| | | |
|---|
| | | List<Map<String, Object>> detailList = finishedOperateLogMapper.getDetailList2(finishedOperateLog.getOrderId(),finishedOperateLog.getProcessId(),finishedOperateLog.getRemarks()); |
|---|
| | | |
|---|
| | | List<Map<String, Object>> detailsmaplist = new ArrayList<Map<String, Object>>(); |
|---|
| | | |
|---|
| | | for(Map<String, Object> details:detailList){ |
|---|
| | | Map<String, Object> detailsmap = new HashMap<>(); |
|---|
| | | detailsmap.put("product_name",details.get("product_name").toString()); |
|---|
| | | detailsmap.put("detailList",finishedOperateLogMapper.getDetailLists(finishedOperateLog.getOrderId(),finishedOperateLog.getRemarks(), Integer.valueOf(details.get("product_id").toString()))); |
|---|
| | | detailsmaplist.add(detailsmap); |
|---|
| | | |
|---|
| | | } |
|---|
| | | itemmap.put("detailList", detailsmaplist); |
|---|
| | | list.add(itemmap); |
|---|
| | | |
|---|
| | | |
|---|
| | | processedProcessIds.add(OrderId); |
|---|
| | | processedProcessIds.add(Remarks); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | map.put("data", list); |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | public String deliveryDetailLogic(List<OrderDetail> list,Object savePoint,String userName) { |
|---|
| | | for (OrderDetail orderDetail : list) { |
|---|
