修改

廖井涛

2024-06-26 c67f38b68366fd30eb3b8512f49e68045d58b6d5

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -12,9 +12,16 @@
import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import jdk.nashorn.internal.parser.JSONParser;
import org.springframework.stereotype.Service;



import java.io.StringReader;
import java.sql.Date;
import java.time.LocalDate;
import java.util.*;

import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
@@ -204,9 +211,16 @@
        return map;
    }

    public Object selectPrintFlowCard(Date selectTime1, Date selectTime2) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.selectPrintFlowCard(selectTime1, selectTime2));
        return map;
    }

    public Object selectPrintSv(String orderId, FlowCard flowCard) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
        map.put("type", flowCardMapper.selectType());
        return map;
    }

@@ -248,20 +262,27 @@
        }
    }

    public Map<String, Object> getSelectPrintLabelSv(Map<String, Object> object) {
    public Map<String, Object> getSelectPrintLabelSv(String projectNo) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.getPrintLabel(projectNo));
        return map;
       /* 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=flowCard.getQuantity();
                for (int i = 0; i < count; i++) {
                    map.put("data", flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
                    //System.out.println(flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
                }
               // 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.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
                    list.add(itemmap);
                //}

            }
        }

        return map;
        map.put("data", list);
        return map;*/
    }

    public Map<String, Object> printFlowCardDetailsSv(String processId, String technologyNumber, FlowCard flowCard) {
@@ -280,27 +301,30 @@
        return true;
    }

    public Map<String, Object> printSetup(PrintSetup printSetup) {

    public Map<String, Object> getSelectPrintCustomLabelSv(String type, Map<String, Object> object) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.selectPrintSetup(printSetup));
        return map;
    }
    public Boolean updatePrintSetup(Map<String, Object> object) {
        System.out.println(object);
        boolean saveState = true;
        String[] stringList=new String[]{"customerName","orderId","typeName","specifications","project","remarks","glassChild","processingNote"};
        for(String strings:stringList){
            if (object.get(strings) != null) {
                if (Objects.equals(object.get(strings).toString(), "true")){
                    flowCardMapper.updatePrintSetup(strings,1);
                }else {
                    flowCardMapper.updatePrintSetup(strings,0);
                }
            }else {
                saveState=false;
        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("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
                    list.add(itemmap);


            }
        }
        return saveState;
        map.put("data", list);
        map.put("title", flowCardMapper.getPrintTitle(type));
        return map;
    }

    public Object getCustomLabelDetailSv(String name, String form, String id, FlowCard flowCard) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.getCustomLabelDetailMp(name, form,id, flowCard));
        return map;
    }

}