opt:手持增加回温间点位信息清除

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java

@@ -71,10 +71,19 @@ public class PdaController {
     @ApiOperation("查询设备编号及状态")
     @SaIgnore
     public ResponseEntity<Object> queryCleanPoint(@RequestBody Map<String, String> whereJson) {
-       String region = whereJson.get("region_code");
+       //String region = whereJson.get("region_code");
+        //清空点位查询拆包区、快速回温区、回温区点位
+        String region = "CB,HW,HWK";
         return new ResponseEntity<>(pointService.getPointsByRegionCodes(region), HttpStatus.OK);
     }
 
+    @PostMapping("/queryCleanRegion")
+    @Log("区域列表")
+    @ApiOperation("区域列表")
+    public ResponseEntity<Object> queryCleanRegion(@RequestBody JSONObject param){
+        return new ResponseEntity<>(regionService.queryCleanRegion(), HttpStatus.OK);
+    }
+
     @PostMapping("/region")
     @Log("区域列表")
     @ApiOperation("区域列表")

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/impl/MaterialDataServiceImpl.java

@@ -65,8 +65,8 @@ public class MaterialDataServiceImpl extends ServiceImpl<MaterialDataMapper, Mat
         List<Map<String, Object>> list = new ArrayList<>();
         for(MaterialDataResponse materialDataResponse:pages.getRecords()){
             Map<String, Object> mp = new LinkedHashMap<>();
-            mp.put("客户编码",materialDataResponse.getSupplierCode());
-            mp.put("客户名称",materialDataResponse.getSupplierName());
+            mp.put("棒源厂家编码",materialDataResponse.getSupplierCode());
+            mp.put("棒源厂家名称",materialDataResponse.getSupplierName());
             mp.put("物料编码",materialDataResponse.getProductName());
             mp.put("日期",materialDataResponse.getDate());
             mp.put("规格",materialDataResponse.getSpecification());

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java

@@ -49,6 +49,8 @@ public interface ISchBaseRegionService extends IService<SchBaseRegion> {
      */
     List<SchBaseRegion> getRegionList(SchBaseRegion region);
 
+    List<SchBaseRegion> queryCleanRegion();
+
     JSONArray getPointStatusSelectById(String regionId);
 
     JSONArray getPointTypeSelectById(String regionId);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java

@@ -14,15 +14,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.nl.wms.sch.region.service.ISchBaseRegionService;
 import org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper;
 import org.nl.wms.sch.region.service.dao.SchBaseRegion;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 
 /**
@@ -92,6 +91,17 @@ public class SchBaseRegionServiceImpl extends ServiceImpl<SchBaseRegionMapper, S
                 .eq(ObjectUtil.isNotEmpty(region), SchBaseRegion::getIs_has_workder, true));
     }
 
+    @Override
+    public List<SchBaseRegion> queryCleanRegion() {
+        Set<String> regions = new HashSet<>();
+        regions.add("CB");
+        regions.add("HW");
+        regions.add("HWK");
+        return schBaseRegionMapper.selectList(new LambdaQueryWrapper<SchBaseRegion>()
+                .in(ObjectUtil.isNotEmpty(regions), SchBaseRegion::getRegion_code,regions)
+        );
+    }
+
     @Override
     public JSONArray getPointStatusSelectById(String regionId) {
         /**

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml

@@ -589,7 +589,7 @@
         t.vehicle_code2  AS subTray,
         t.vehicle_code  AS motherTray,
         t.update_time  AS updateTime,
-        v.standing_time  AS standingTime,
+        1  AS standingTime,
         m2.siliconGrade  AS siliconGrade,
         m2.productDescription  AS productDescription,
         m2.supplierName  AS supplierName,
@@ -603,7 +603,6 @@
         sch_base_task t
         LEFT JOIN sch_base_point p ON t.point_code1 = p.point_code
         LEFT JOIN sch_base_point p2 ON t.point_code2 = p2.point_code
-        LEFT JOIN sch_base_vehiclematerialgroup v ON t.vehicle_code2 = v.vehicle_code
         LEFT JOIN (
         SELECT
         m.PalletSN AS PalletSN,

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java

@@ -104,8 +104,8 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
             }
 
             mp.put("物料名称",detailDto.getProductDescription());
-            mp.put("客户编码",detailDto.getSupplierCode());
-            mp.put("客户名称",detailDto.getSupplierName());
+            mp.put("棒源厂家编码",detailDto.getSupplierCode());
+            mp.put("棒源厂家名称",detailDto.getSupplierName());
             mp.put("入库时间",DateUtil.format(detailDto.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
             list.add(mp);
         }