add mainCode

wujian

2024-05-31 b26a2da3d454b93b496bc364a024f978f3edfd7e

add mainCode

 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java

@@ -4,7 +4,6 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.constant.Constants;
@@ -17,10 +16,7 @@
import com.jcdm.main.da.passingStationCollection.query.ProductOrderQuery;
import com.jcdm.main.da.passingStationCollection.query.ProductOrderVO;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.util.TimeUtil;
import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.jcdm.main.work.domain.KeyCodeRelation;
import com.jcdm.main.work.domain.WorkOrder;
import com.jcdm.main.work.service.KeyCodeCheckService;
@@ -181,15 +177,26 @@
                            if (CollUtil.isNotEmpty(collect)){
                                query.setProductNum(collect.get(0).getProductNum());
                            }
                            ProductOrderVO vo = daPassingStationCollectionService.queryMessFromLine(query);
//                            ProductOrderVO vo = daPassingStationCollectionService.queryMessFromLine(query);
                            ProductOrderVO vo = new ProductOrderVO();
                            ProductOrderChild child = new ProductOrderChild();
                            child.setModel("modelCode123123123");
                            child.setStationCode("M1OP100-1");
                            child.setProductNum("productNum123113");
                            child.setMaterialCode("materialCode2323");
                            child.setProductionOrderNum("proOrderNum123");
                            vo.setData(child);
                            vo.setCode(Constants.SUCCESS);
                            if (Constants.SUCCESS.equals(vo.getCode())){
                                WorkOrder workOrder = new WorkOrder();
                                ProductOrderChild data = vo.getData();
                                workOrder.setId(123L);
                                workOrder.setProductNum(data.getProductNum());
                                workOrder.setProductionOrderNum(data.getProductionOrderNum());
                                workOrder.setStationCode(data.getStationCode());
                                workOrder.setMaterialCode(data.getMaterialCode());
                                workOrder.setModel(data.getModel());
                                workOrder.setCreateTime(new Date());
                                workOrderService.save(workOrder);
                                //写入模组码、工单号、产品型号到plc
                                log.info("写入模组码、工单号、产品型号到plc");
@@ -211,7 +218,7 @@
                                if (CollUtil.isNotEmpty(paramCollectionList1)){
                                    List<KeyCodeRelation> relationList = new ArrayList<>();
                                    for (ReadWriteEntity readWriteEntity : paramCollectionList1) {
                                        if (ObjectUtil.isNotNull(readWriteEntity.getValue())){
                                        if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && StrUtil.isNotBlank(readWriteEntity.getValue().toString())){
                                            KeyCodeRelation keyCodeRelation = new KeyCodeRelation();
                                            keyCodeRelation.setModuleCode(data.getModel());
                                            keyCodeRelation.setKeyCode(readWriteEntity.getValue().toString());

 jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java

@@ -19,10 +19,7 @@
import com.jcdm.main.restful.qingYan.doman.ParentVO;
import com.jcdm.main.restful.qingYan.doman.PostEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.lang.reflect.Field;
@@ -76,6 +73,11 @@
    }


    @PostMapping("/saveKeyCodeCheck")
    public void saveKeyCodeCheckList(){

    }



    /**

 jcdm-main/src/main/java/com/jcdm/main/work/service/impl/KeyCodeRelationServiceImpl.java

@@ -21,7 +21,7 @@
        try{
            this.saveBatch(confList);
        }catch (Exception e){
            return;
            System.out.println(e.getMessage());
        }

    }