opt: 滚筒线数据

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java

@@ -429,8 +429,12 @@ public class PdaServiceImpl implements PdaService {
         if (ObjectUtil.isEmpty(material)) {
             throw new BadRequestException("物料信息不存在");
         }
-        SchBaseVehiclematerialgroup group = new SchBaseVehiclematerialgroup();
-        group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        SchBaseVehiclematerialgroup group = vehiclematerialgroupService.getGroupInfo(shelfSaveDto.getVehicle_code(),
+                GeneralDefinition.STEEL_TRAY, GroupBindMaterialStatusEnum.BOUND.getValue());
+        if (ObjectUtil.isEmpty(group)) {
+            group = new SchBaseVehiclematerialgroup();
+            group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        }
         group.setMaterial_qty(Integer.valueOf(shelfSaveDto.getMaterial_qty()));
         group.setMaterial_id(shelfSaveDto.getMaterial_id());
         group.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
@@ -447,6 +451,6 @@ public class PdaServiceImpl implements PdaService {
         group.setCreate_id(SecurityUtils.getCurrentUserId());
         group.setCreate_name(SecurityUtils.getCurrentNickName());
         group.setCreate_time(DateUtil.now());
-        vehiclematerialgroupService.save(group);
+        vehiclematerialgroupService.saveOrUpdate(group);
     }
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/controller/ReportController.java

@@ -11,6 +11,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
@@ -72,7 +73,7 @@ public class ReportController {
 
     @GetMapping("/insideDrumLineReport")
     @Log("滚筒线内物料实时报表")
-    public ResponseEntity<Object> insideDrumLineReport(Map json, PageQuery page) {
+    public ResponseEntity<Object> insideDrumLineReport(@RequestParam Map json, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(reportService.insideDrumLineReport(json, page)), HttpStatus.OK);
     }
 }

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

@@ -20,5 +20,5 @@ public interface ReportMapper {
 
     IPage<MaterialTimeoutVo> inventoryMaterialTimeoutWarning(IPage<MaterialTimeoutVo> pages, JSONObject object);
 
-    IPage<InsideDrumLineVo> insideDrumLineReport(IPage<InsideDrumLineVo> pages, JSONObject object);
+    IPage<InsideDrumLineVo> insideDrumLineReport(IPage<InsideDrumLineVo> pages, String blurry);
 }

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

@@ -68,5 +68,9 @@
                  LEFT JOIN md_base_material m ON m.material_id = vg.material_id
         WHERE vg.point_code IN ('HCSSX01', 'HCSSX63')
           AND vg.group_bind_material_status = '2'
+        <if test="blurry != null">
+            AND m.material_code LIKE '%${blurry}%'
+        </if>
+        ORDER BY vg.update_time DESC
     </select>
 </mapper>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java

@@ -1,5 +1,6 @@
 package org.nl.wms.report.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,8 +57,9 @@ public class ReportServiceImpl implements ReportService {
 
     @Override
     public IPage<InsideDrumLineVo> insideDrumLineReport(Map query, PageQuery page) {
+        String blurry = ObjectUtil.isNotEmpty(query.get("blurry")) ? query.get("blurry").toString() : null;
         IPage<InsideDrumLineVo> pages = new Page<>(page.getPage() + 1, page.getSize());
-        pages = reportMapper.insideDrumLineReport(pages, new JSONObject(query));
+        pages = reportMapper.insideDrumLineReport(pages, blurry);
         return pages;
     }
 }

lms/nladmin-ui/src/views/login.vue

@@ -56,8 +56,8 @@ export default {
       codeUrl: '',
       cookiePass: '',
       loginForm: {
-        username: 'admin',
-        password: '123456',
+        username: '',
+        password: '',
         rememberMe: false,
         code: '',
         uuid: ''

lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue

@@ -2,6 +2,26 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊搜索">
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="mini"
+              placeholder="产品编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表格渲染-->