From d1ea726be5628c46fb6be700a0197002d55d39f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 13:14:24 +0800
Subject: [PATCH] 修改2.0   9.25

---
 inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml                        |   82 -----------
 inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java             |    9 -
 inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java          |   22 ---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java |   93 +++++++++----
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java            |   10 
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java                    |    5 
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java    |   11 -
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java        |    1 
 inspect-server/src/main/resources/mapper/InspectionItemMapper.xml                           |   30 ----
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java               |    3 
 inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java    |   67 ---------
 inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java                |   10 -
 inspect-server/src/main/resources/mapper/RawInsProductMapper.xml                            |   30 ----
 inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java                          |    5 
 14 files changed, 72 insertions(+), 306 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
index 940c536..1f1a17f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -30,71 +30,6 @@
     @Autowired
     private InspectUnacceptedService inspectUnacceptedService;
 
-    @Autowired
-    private Jwt jwt;
-
-    @ApiOperation(value = "涓嶅悎鏍煎搧绠＄悊鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
-            @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
-            @ApiImplicitParam(name = "formTime", value = "鏉ユ枡鏃ユ湡", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "dealState", value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
-            @ApiImplicitParam(name = "productCategories", value = "浜у搧澶х被", dataTypeClass = Integer.class),
-    })
-    @GetMapping("/selectUnRawInspectsList")
-    public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState, Integer productCategories) {
-        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime, dealState, productCategories);
-        Map<String, Object> map = new HashMap<>();
-        map.put("total", inspectionPage.getTotal());
-        map.put("row", inspectionPage.getRecords());
-        return Result.success(map);
-    }
-
-    @ApiOperation(value = "鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃", tags = "QMS绠＄悊-->鍘熸潗鏂欎笉鍚堟牸鍝�")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
-            @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
-            @ApiImplicitParam(name = "formTime", value = "鏉ユ枡鏃ユ湡", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "productName", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "supplier", value = "渚涘簲鍟�", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "processingStatus", value = "澶勭悊鐘舵��", dataTypeClass = Integer.class)
-    })
-    @GetMapping("/selectURawMaterials")
-    public Result<?> selectUnqualifiedRawMaterials(int pageSize,
-                                                   int countSize,
-                                                   String formTime,
-                                                   String productName,
-                                                   String supplier,
-                                                   Integer processingStatus) {
-        IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnqualifiedRawMaterials(
-                new Page<Object>(pageSize, countSize),
-                formTime,
-                productName,
-                supplier,
-                processingStatus);
-        Map<String, Object> map = new HashMap<>();
-        map.put("total", inspectionPage.getTotal());
-        map.put("row", inspectionPage.getRecords());
-        return Result.success(map);
-    }
-
-    @ApiOperation(value = "璇勫", tags = "QMS绠＄悊-->鍘熸潗鏂欎笉鍚堟牸鍝�")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "rawId", value = "鍘熸潗鏂橧d", dataTypeClass = Integer.class, required = true),
-            @ApiImplicitParam(name = "passOrNo", value = "鏄惁閫氳繃锛�0锛氫笉閫氳繃锛�1锛氶�氳繃", dataTypeClass = Integer.class, required = true)
-    })
-    @PostMapping("/evaluatePassOrNo")
-    public Result<?> rawEvaluate(Integer rawId, Integer passOrNo) {
-        if (inspectUnacceptedService.getById(rawId).getDealState() == 1) {
-            return Result.fail("宸茬粡璇勫杩囦簡涓嶈兘鍐嶆璇勫!");
-        }
-        Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo);
-        if (integer >= 1) {
-            return Result.success("璇勫鎴愬姛锛�");
-        }
-        return Result.fail("璇勫澶辫触锛�");
-    }
-
     @ApiOperation(value = "涓嶅悎鏍煎搧鍒嗛〉鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -142,7 +77,7 @@
             @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true),
             @ApiImplicitParam(name = "opinionTell", value = "澶勭疆鎰忚", dataTypeClass = String.class, required = true),
             @ApiImplicitParam(name = "way", value = "澶勭悊鏂瑰紡", dataTypeClass = Integer.class, required = true),
-            @ApiImplicitParam(name = "type", value = "涓嶅悎鏍肩被鍨�", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "type", value = "涓嶅悎鏍肩被鍨�", dataTypeClass = Integer.class, required = true)
     })
     @PostMapping("/editDisposalOpinion")
     public Result<?> editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
index bbd6cf7..04cd708 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.FinishedInspect;
 import com.yuanchu.mom.pojo.InspectUnaccepted;
 import com.yuanchu.mom.pojo.vo.RawInspectVo;
 
@@ -16,14 +17,11 @@
  */
 public interface InspectUnacceptedMapper extends BaseMapper<InspectUnaccepted> {
 
-
-    //鏌ヨ鎴愬搧妫�楠屼腑涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
-    IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories);
-
-    IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
-
+    //鍒嗛〉鏌ヨ涓嶅悎鏍煎搧澶勭疆
     IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state);
 
+    //鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭�
     RawInspectVo editDisposalOpinionConfirmation(Integer rawUnacceptedId);
+
 }
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java
index f0305f9..0871763 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java
@@ -24,7 +24,4 @@
     List<InspectionItemDto> selectInspectionItem(Integer id, Integer type);
 
 
-    //鎵归噺淇敼,鎶婂師鏈夌殑妫�楠岄」鐩殑鏁版嵁娓呯┖
-    void updateBatch(List<InspectionItem> inspectionItems);
-
 }
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
index ba9785b..b30999f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
@@ -1,12 +1,10 @@
 package com.yuanchu.mom.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import com.yuanchu.mom.mybatis_config.MyBaseMapper;
 import com.yuanchu.mom.pojo.RawInsProduct;
-
 import java.util.List;
-import java.util.Map;
+
 
 /**
  * 鍘熸潗鏂欑敵璇峰崟涓殑椤圭洰鍒楄〃(RawInsProduct)琛ㄦ暟鎹簱璁块棶灞�
@@ -16,12 +14,8 @@
  */
 public interface RawInsProductMapper extends MyBaseMapper<RawInsProduct> {
 
-
     //鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ヨ妫�楠岄」鐩�
     List<Integer> getresult(Integer id);
 
-
-    //鎵归噺娓呯┖妫�楠屽��
-    void updateBatch(List<RawInsProduct> rawInsProductList);
 }
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
index 3dc9130..4dc7246 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
@@ -51,11 +51,6 @@
     private Integer dealState;
 
     /**
-     * 澶勭悊缁撴灉 0锛氫笉閫氳繃锛�1锛氶�氳繃
-     **/
-    private Integer dealReasult;
-
-    /**
      * 澶勭悊鏃ユ湡
      **/
     @DateTimeFormat(pattern = "yyyy-MM-dd")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
index c79af35..58e765f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
@@ -17,26 +17,6 @@
 public interface InspectUnacceptedService extends IService<InspectUnaccepted> {
 
     /**
-     *鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
-     * @param
-     * @param formTime
-     * @param dealState
-     * @return
-     */
-    IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories);
-
-    /**
-     * 鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
-     * @param page
-     * @param formTime
-     * @param productName
-     * @param supplier
-     * @param processingStatus
-     * @return
-     */
-    IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
-
-    /**
      * 涓嶅悎鏍煎搧澶勭疆鍒嗛〉鍒楄〃
      * @param page
      * @param specificationModel
@@ -54,8 +34,6 @@
      */
     Integer descriptionUpdate(Integer rawUnacceptedId, String tell);
 
-    //璇勫
-    Integer rawEvaluate(Integer rawId, Integer passOrNo);
 
     @Transactional(rollbackFor = Exception.class)
     Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
index 5812158..21f661a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
@@ -34,15 +34,6 @@
      */
     Integer addProcessInspectionSheet(String username, UpdateInspectionItemDto updateInspectionItemDto);
 
-    /**
-     * 鏂板鎸夐挳-->閫夋嫨璁惧
-     * @param technologyId
-     * @param father
-     * @param name
-     * @return
-     */
-    //List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name);
-
 
     /**
      * 鏇存敼璁惧
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index 54b3d17..3da8183 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -6,8 +6,9 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
-import com.yuanchu.mom.pojo.InspectUnaccepted;
-import com.yuanchu.mom.pojo.RawInspect;
+import com.yuanchu.mom.mapper.InspectionItemMapper;
+import com.yuanchu.mom.pojo.*;
+import com.yuanchu.mom.pojo.dto.InspectionItemDto;
 import com.yuanchu.mom.pojo.vo.RawInspectVo;
 import com.yuanchu.mom.service.*;
 import com.yuanchu.mom.utils.MyUtil;
@@ -16,7 +17,11 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.xml.crypto.Data;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 涓嶅悎鏍煎搧妫�楠岃〃(InspectUnaccepted)琛ㄦ湇鍔″疄鐜扮被
@@ -46,22 +51,19 @@
     @Autowired
     private ProcessInspectService processInspectService;
 
-    //鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
-    @Override
-    public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories) {
-        return inspectUnacceptedMapper.selectInsList(page, formTime, dealState, productCategories);
-    }
+    @Resource
+    InspectionItemMapper inspectionItemMapper;
 
-    @Override
-    public IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus) {
-        return inspectUnacceptedMapper.selectUnqualifiedRawMaterials(page, formTime, productName, supplier, processingStatus);
-    }
+    @Resource
+    InspectionItemService inspectionItemService;
 
+    //涓嶅悎鏍煎缃垪琛�
     @Override
     public IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state) {
         return inspectUnacceptedMapper.selectDisposal(page, specificationModel, productName, productCategories, state);
     }
 
+    //鐜拌薄鎻忚堪澶辩劍淇濆瓨
     @Override
     public Integer descriptionUpdate(Integer rawUnacceptedId, String tell) {
         LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
@@ -70,26 +72,21 @@
         return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
     }
 
-    //璇勫
-    @Override
-    public Integer rawEvaluate(Integer rawId, Integer passOrNo) {
-        LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
-                .eq(InspectUnaccepted::getId, rawId)
-                .set(InspectUnaccepted::getDealReasult, passOrNo);
-        return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
-    }
-
     //缂栬緫澶勭疆鎰忚纭畾鎸夐挳
     @Override
     public Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
+        //鏍规嵁涓嶅悎鏍煎搧id鏌ヨ涓嶅悎鏍煎搧淇℃伅
+        InspectUnaccepted inspectUnaccepted = inspectUnacceptedMapper.selectById(rawUnacceptedId);
         LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
                 .eq(InspectUnaccepted::getId, rawUnacceptedId)
                 .set(InspectUnaccepted::getWay, way)
+                .set(InspectUnaccepted::getDealState, 1)
+                .set(InspectUnaccepted::getDealTime, new Date())
                 .set(InspectUnaccepted::getOpinionTell, opinionTell);
-        if (way == 1){
+        if (way == 1) {
             // 绛変簬0锛氬師鏉愭枡
-            if (type == 0){
-                // 鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭俊鎭�
+            if (type == 0) {
+                // 鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭�
                 RawInspectVo map = inspectUnacceptedMapper.editDisposalOpinionConfirmation(rawUnacceptedId);
                 RawInspect rawInspect = new RawInspect();
                 BeanUtils.copyProperties(map, rawInspect);
@@ -98,15 +95,55 @@
                 // 鎵归噺淇濆瓨瀛愮骇
                 rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
             }
-            // 绛変簬1锛氫骇鍝�
+            // 绛変簬1锛氫骇鍝佹楠�(鍗婃垚鍝�)
             else if (type == 1) {
-                // TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
+                //鏍规嵁id鏌ヨ浜у搧妫�楠屼俊鎭�
+                FinishedInspect finishedInspect = finishedInspectService.getById(inspectUnaccepted.getRawInspectId());
+                //鏍规嵁浜у搧妫�楠屽崟id鏌ヨ妫�楠岄」鐩�
+                List<InspectionItem> inspectionItems = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
+                        .eq("inspect_id", finishedInspect.getId())
+                        .eq("type", 2));
+                //淇濆瓨浜у搧鍗�
+                finishedInspect.setId(null);
+                finishedInspect.setResult(null);
+                finishedInspectService.save(finishedInspect);
+                //淇濆瓨浜у搧椤圭洰
+                List<InspectionItem> inspectionItemList = inspectionItems.stream().map(inspectionItem -> {
+                    inspectionItem.setId(null);
+                    inspectionItem.setInspectionValue(null);
+                    inspectionItem.setDeviceId(null);
+                    inspectionItem.setResult(null);
+                    inspectionItem.setInspectId(finishedInspect.getId());
+                    inspectionItem.setUsername(null);
+                    return inspectionItem;
+                }).collect(Collectors.toList());
+                inspectionItemService.saveBatch(inspectionItemList);
             }
-            // 绛変簬2锛氳繃绋�
+            // 绛変簬2锛氳繃绋嬫楠�(鍦ㄥ埗鍝�)
             else if (type == 2) {
-                // TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
+                //鏍规嵁id鏌ヨ浜у搧妫�楠屼俊鎭�
+                ProcessInspect processInspect = processInspectService.getById(inspectUnaccepted.getRawInspectId());
+                //鏍规嵁浜у搧妫�楠屽崟id鏌ヨ妫�楠岄」鐩�
+                List<InspectionItem> inspectionItems = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
+                        .eq("inspect_id", processInspect.getId())
+                        .eq("type", 1));
+                //淇濆瓨浜у搧鍗�
+                processInspect.setId(null);
+                processInspect.setResult(null);
+                processInspectService.save(processInspect);
+                //淇濆瓨浜у搧椤圭洰
+                List<InspectionItem> inspectionItemList = inspectionItems.stream().map(inspectionItem -> {
+                    inspectionItem.setId(null);
+                    inspectionItem.setInspectionValue(null);
+                    inspectionItem.setDeviceId(null);
+                    inspectionItem.setResult(null);
+                    inspectionItem.setInspectId(processInspect.getId());
+                    inspectionItem.setUsername(null);
+                    return inspectionItem;
+                }).collect(Collectors.toList());
+                inspectionItemService.saveBatch(inspectionItemList);
             }
-        } else if (way == 2 || way == 3 || way == 4){
+        } else if (way == 2 || way == 3 || way == 4) {
             updateWrapper.set(InspectUnaccepted::getFaultyMaterials, 1);
         }
         return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
index cfe7b55..248bef1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
@@ -34,8 +34,6 @@
     @Resource
     private InspectionItemMapper inspectionItemMapper;
 
-    @Resource
-    TechniqueMapper techniqueMapper;
 
 
 
@@ -44,15 +42,6 @@
     public List<InspectionItemDto> selectInspectionItem(Integer id, Integer type) {
         return inspectionItemMapper.selectInspectionItem(id,type);
     }
-
-
-    //鏂板杩囩▼妫�楠屽崟-->閫夋嫨璁惧
-    /*@Override
-    public List<Map<String, Object>> chooseDev(Integer technologyId, String father, String name) {
-        //璇ュ伐鑹篿d涓嬬敓浜у伐鑹烘渶鏂扮増鏈�
-        Integer ver = techniqueMapper.selectVerByTeId(technologyId).get(0);
-        return techniqueMapper.selDevByVerTecIdFaNam(technologyId, father, name, ver);
-    }*/
 
     //鏇存敼璁惧
     @Override
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 3b863f5..b5923e3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -178,7 +178,6 @@
                     .reason(rawInspectMapper.selectById(id).getName() + "涓嶅悎鏍�")  //鏆備笖瀹氫箟涓哄師鏉愭枡涓嶅悎鏍�
                     .number(number)
                     .rawInspectId(id)
-                    .dealReasult(1)
                     .type(0)        //绫诲瀷涓哄師鏉愭枡
                     .build();
             inspectUnacceptedMapper.insert(rawUnaccepted);
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 344c98d..4822821 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,87 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
-    <!--涓嶅悎鏍肩鐞�-->
-    <select id="selectInsList" resultType="java.util.Map">
-        SELECT ru.id,
-        ru.reason,
-        u.`name`,
-        ru.deal_state,
-        ru.deal_reasult,
-        DATE_FORMAT(fi.dateArrival, '%Y-%m-%d') dateArrival,
-        fi.material_code,
-        fi.project_name,
-        fi.specifications_model,
-        fi.unit,
-        number quantity,
-        DATE_FORMAT(fi.inspectionDate, '%Y-%m-%d') inspectionDate,
-        DATE_FORMAT(fi.processingDate, '%Y-%m-%d') processingDate
-        FROM mom_ocean.inspect_unaccepted ru, mom_ocean.`user` u, (
-        SELECT p.id, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') dateArrival, p.`material_code`, p.`material` project_name,
-        p.`specifications_model`,
-        p.`unit`, p.`quantity`,DATE_FORMAT(p.`create_time`, '%Y-%m-%d') inspectionDate, DATE_FORMAT(p.`update_time`,
-        '%Y-%m-%d') processingDate, p.`user_id`, 2 AS
-        classify
-        FROM mom_ocean.process_inspect p
-        WHERE p.`state` = 1
-        UNION ALL
-        SELECT fi.id, DATE_FORMAT(fi.create_time, '%Y-%m-%d')
-        dateArrival,material_code, material project_name,specifications_model,
-        unit,quantity,DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,DATE_FORMAT(fi.update_time, '%Y-%m-%d')
-        processingDate, fi.`user_id`, 1 AS classify
-        FROM mom_ocean.finished_inspect fi
-        WHERE fi.`state` = 1) fi
-        WHERE fi.id = ru.raw_inspect_id
-        AND ru.`type` = fi.`classify`
-        AND ru.type != 0
-        AND ru.state=1
-        AND fi.`user_id` = u.`id`
-        <if test="dealState!=null">
-            and ru.deal_state = #{dealState}
-        </if>
-        <if test="formTime!=null and formTime!=''">
-            and fi.dateArrival=#{formTime}
-        </if>
-        <if test="productCategories != null">
-            and ru.`type` = #{productCategories}
-        </if>
-        order by ru.id desc
-    </select>
-
-    <!--鍘熸潗鏂欎笉鍚堟牸鍝�-->
-    <select id="selectUnqualifiedRawMaterials" resultType="map">
-        SELECT i.id,
-        DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
-        i.`reason`,
-        r.`code`,
-        r.`name`,
-        r.`specifications`,
-        r.`unit`,
-        i.number,
-        DATE_FORMAT(r.`create_time`,'%Y-%m-%d') inspectionDate,
-        r.`user_name`,
-        DATE_FORMAT(r.`ins_time`,'%Y-%m-%d') processingDate,
-        r.`supplier`,
-        i.`deal_state`,
-        i.`deal_reasult`
-        FROM mom_ocean.inspect_unaccepted i
-        LEFT JOIN mom_ocean.raw_inspect r ON i.`raw_inspect_id` = r.`id`
-        WHERE i.`state` = 1
-        AND i.`type` = 0
-        <if test="formTime != null and formTime != ''">
-            AND r.form_time = #{formTime}
-        </if>
-        <if test="productName != null and productName != ''">
-            AND r.name LIKE CONCAT('%', #{productName}, '%')
-        </if>
-        <if test="supplier != null and supplier != ''">
-            AND r.supplier LIKE CONCAT('%', #{supplier}, '%')
-        </if>
-        <if test="processingStatus != null">
-            AND i.deal_state = #{processingStatus}
-        </if>
-        ORDER BY i.`id` DESC
-    </select>
 
     <!--涓嶅悎鏍煎缃�-->
     <select id="selectDisposal" resultType="map">
@@ -130,7 +49,6 @@
         </if>
         )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
         WHERE i.`state` = 1
-        AND i.`deal_reasult` = 0
         <if test="state != null">
             AND i.`deal_state` = #{state}
         </if>
diff --git a/inspect-server/src/main/resources/mapper/InspectionItemMapper.xml b/inspect-server/src/main/resources/mapper/InspectionItemMapper.xml
index 9008f43..496cdf2 100644
--- a/inspect-server/src/main/resources/mapper/InspectionItemMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectionItemMapper.xml
@@ -1,36 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yuanchu.mom.mapper.InspectionItemMapper">
-    <!--鎶婂師鏈夌殑妫�楠岄」鐩殑鏁版嵁娓呯┖-->
-    <update id="updateBatch">
-        UPDATE mom_ocean.inspection_item o
-        <trim prefix="set" suffixOverrides=",">
-            <trim prefix="inspection_value=case" suffix="end,">
-                <foreach collection="inspectionItems" item="item" index="index">
-                    WHEN o.id = #{item.id} THEN null
-                </foreach>
-            </trim>
-            <trim prefix="device_id=case" suffix="end,">
-                <foreach collection="inspectionItems" item="item" index="index">
-                    WHEN o.id = #{item.id} THEN null
-                </foreach>
-            </trim>
-            <trim prefix="result=case" suffix="end,">
-                <foreach collection="inspectionItems" item="item" index="index">
-                    WHEN o.id = #{item.id} THEN null
-                </foreach>
-            </trim>
-            <trim prefix="username=case" suffix="end,">
-                <foreach collection="inspectionItems" item="item" index="index">
-                    WHEN o.id = #{item.id} THEN null
-                </foreach>
-            </trim>
-        </trim>
-        WHERE o.id in
-        <foreach collection="inspectionItems" index="index" item="item" separator="," open="(" close=")">
-            #{item.id, jdbcType=BIGINT}
-        </foreach>
-    </update>
     <resultMap id="selectInspectionItemMap" type="inspectionItemDto">
         <id property="father" column="ifather"/>
         <association property="children" resultMap="selectInspectionItemDto2Map"/>
diff --git a/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml b/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
index b21cdb4..3c9a5d9 100644
--- a/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInsProductMapper.xml
@@ -1,36 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yuanchu.mom.mapper.RawInsProductMapper">
-    <!--鎵归噺娓呯┖妫�楠岀姸鎬�-->
-    <update id="updateBatch">
-        UPDATE mom_ocean.raw_ins_product o
-        <trim prefix="set" suffixOverrides=",">
-            <trim prefix="test_value=case" suffix="end,">
-                <foreach collection="rawInsProductList" item="item" index="index">
-                    WHEN o.id = #{item.id} THEN null
-                </foreach>
-            </trim>
-            <trim prefix="device_id=case" suffix="end,">
-                <foreach collection="rawInsProductList" item="item" index="index">
-                    WHEN o.id = #{item.id} THEN null
-                </foreach>
-            </trim>
-            <trim prefix="test_state=case" suffix="end,">
-                <foreach collection="rawInsProductList" item="item" index="index">
-                    WHEN o.id = #{item.id} THEN null
-                </foreach>
-            </trim>
-            <trim prefix="user_id=case" suffix="end,">
-                <foreach collection="rawInsProductList" item="item" index="index">
-                    WHEN o.id = #{item.id} THEN null
-                </foreach>
-            </trim>
-        </trim>
-        WHERE o.id in
-        <foreach collection="rawInsProductList" index="index" item="item" separator="," open="(" close=")">
-            #{item.id, jdbcType=BIGINT}
-        </foreach>
-    </update>
     <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ヨ妫�楠岄」鐩�-->
     <select id="getresult" resultType="java.lang.Integer">
         select test_state
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java b/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
index f7b4363..c4d5ba1 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
@@ -29,8 +29,6 @@
 
     private static final String IMPORT_POL_RECEIVE = "http://192.168.20.47:8081/ErpServices/PurchaseReceiptService/importPolReceive";
 
-    private static final String IFS_UPDATE="http://192.168.20.47:8081/ErpServices/PurchaseReceiptService/importPolReceive";
-
     private static final Map<String, String> GET_TOKEN_HEADER = new HashMap<>(2);
 
     private static final Map<String, Object> USER_INFO = new HashMap<>(4);
@@ -132,7 +130,4 @@
         System.out.println(importPolReceive(batchInfos));
     }
 
-    public static void ifsUpdate(){
-
-    }
 }

--
Gitblit v1.9.3