代码更新

lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/VehicleController.java

@@ -2,6 +2,7 @@
 package org.nl.wms.basedata.rest;
 
 
+import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.basedata.service.VehicleService;
 import org.nl.wms.basedata.service.dto.VehicleDto;
 import org.springframework.data.domain.Pageable;
@@ -41,9 +42,9 @@ public class VehicleController {
     @Log("新增载具维护")
     @ApiOperation("新增载具维护")
     //@SaCheckPermission("@el.check('vehicle:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody VehicleDto dto){
+    public ResponseEntity<Object> create(@Validated @RequestBody JSONObject WhereJson){
-        vehicleService.create(dto);
+
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(vehicleService.create(WhereJson),HttpStatus.CREATED);
     }
 
     @PutMapping
@@ -63,4 +64,12 @@ public class VehicleController {
         vehicleService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @GetMapping("/getVehicle/{code}")
+    @Log("获取起始载具号")
+    @ApiOperation("获取起始载具号")
+    public ResponseEntity<Object> getVehicle(@PathVariable String code) {
+        JSONObject json = vehicleService.getVehicle(code);
+        return new ResponseEntity<>(json,HttpStatus.OK);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/VehicleService.java

@@ -1,6 +1,8 @@
 
 package org.nl.wms.basedata.service;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.nl.wms.basedata.service.dto.VehicleDto;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
@@ -47,9 +49,9 @@ public interface VehicleService {
 
     /**
     * 创建
-    * @param dto /
+    * @param WhereJson /
     */
-    void create(VehicleDto dto);
+    JSONArray create(JSONObject WhereJson);
 
     /**
     * 编辑
@@ -62,4 +64,10 @@ public interface VehicleService {
     * @param ids /
     */
     void deleteAll(Long[] ids);
+
+    /**
+     * 获取起始载具号
+     * @param code /
+     */
+    JSONObject getVehicle(String code);
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java

@@ -2,15 +2,21 @@
 package org.nl.wms.basedata.service.impl;
 
 
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.system.service.impl.GenCodeServiceImpl;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.WQL;
 import org.nl.wms.basedata.service.VehicleService;
 import org.nl.wms.basedata.service.dto.VehicleDto;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.data.domain.Pageable;
+
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,9 +43,14 @@ public class VehicleServiceImpl implements VehicleService {
 
     @Override
     public Map<String,Object> queryAll(Map whereJson, Pageable page){
-        WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
+        String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code");
-        ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
+
-        final JSONObject json = rb.pageResult();
+        JSONObject map = new JSONObject();
+        map.put("flag", "1");
+        map.put("vehicle_type", MapUtil.getStr(whereJson, "vehicle_type"));
+        if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code","%"+vehicle_code+"%");
+
+        JSONObject json = WQL.getWO("QMD_PB_VEHICLE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
         return json;
     }
 
@@ -73,23 +84,45 @@ public class VehicleServiceImpl implements VehicleService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void create(VehicleDto dto) {
+    public JSONArray create(JSONObject WhereJson) {
+
+        WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
+
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
-        dto.setVehicle_id(IdUtil.getSnowflake(1, 1).nextId());
+        String vehicle_type = WhereJson.getString("vehicle_type");
-        dto.setVehicle_name(dto.getVehicle_name());
+        String code = "";
-        dto.setCreate_id(currentUserId);
+        switch (vehicle_type) {
-        dto.setCreate_name(nickName);
+            case "01":
-        dto.setUpdate_optid(currentUserId);
+                code = "1m3_ttp";
-        dto.setUpdate_optname(nickName);
+                break;
-        dto.setUpdate_time(now);
+            case "02":
-        dto.setCreate_time(now);
+                code = "1m6_ttp";
+                break;
+            case "03":
+                code = "1m9_ttp";
+                break;
+        }
 
-        WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
+        JSONArray resultCodeArr = new JSONArray();
-        JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
+        int num = WhereJson.getIntValue("num");
-        wo.insert(json);
+        for (int i = 0; i < num; i++) {
+            VehicleDto dto = new VehicleDto();
+            dto.setVehicle_id(IdUtil.getSnowflake(1,1).nextId());
+            dto.setVehicle_code(CodeUtil.getNewCode(code));
+            dto.setVehicle_name(dto.getVehicle_code());
+            dto.setVehicle_type(vehicle_type);
+            dto.setCreate_id(currentUserId);
+            dto.setCreate_name(nickName);
+            dto.setCreate_time(now);
+
+            JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
+            wo.insert(json);
+            resultCodeArr.add(dto.getVehicle_code());
+        }
+        return resultCodeArr;
     }
 
     @Override
@@ -130,4 +163,31 @@ public class VehicleServiceImpl implements VehicleService {
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public JSONObject getVehicle(String code) {
+        String term = "";
+        switch (code) {
+            case "01":
+                term = "1m3_ttp";
+                break;
+            case "02":
+                term = "1m6_ttp";
+                break;
+            case "03":
+                term = "1m9_ttp";
+                break;
+        }
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("code", term);
+        map.put("flag", "0");
+        GenCodeServiceImpl genCodeService = new GenCodeServiceImpl();
+        String value = genCodeService.codeDemo(map);
+
+        JSONObject json = new JSONObject();
+        json.put("value", value);
+        return json;
+    }
+
 }

lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE.wql

@@ -0,0 +1,64 @@
+[交易说明]
+	交易名：	载具分页查询
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					        TYPEAS s_string
+	输入.vehicle_type			        TYPEAS s_string
+	输入.vehicle_code			        TYPEAS s_string
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+	IF 输入.flag = "1"
+		PAGEQUERY
+			SELECT
+            	*
+            FROM
+            	md_pb_vehicle
+            WHERE
+            	1=1
+
+                OPTION 输入.vehicle_code <> ""
+                         vehicle_code like 输入.vehicle_code
+                ENDOPTION
+
+                OPTION 输入.vehicle_type <> ""
+                         vehicle_type = 输入.vehicle_type
+                ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+
+

lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue

@@ -2,13 +2,66 @@
   <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="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="载具类型">
+            <el-select
+              v-model="query.vehicle_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 180px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.vehicle_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="载具号">
+            <el-input
+              v-model="query.vehicle_code"
+              clearable
+              size="mini"
+              placeholder="载具号"
+              style="width: 180px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation/>
+        </el-form>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-printer"
+          size="mini"
+          :disabled="crud.selections.length < 1"
+          @click="print"
+        >
+          打印
+        </el-button>
+      </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
           <el-form-item label="载具编码" prop="vehicle_code">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" />
+            <el-input v-model="form.vehicle_code" :disabled="true" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="载具类型">
             <el-select
@@ -18,6 +71,7 @@
               size="mini"
               class="filter-item"
               style="width: 370px;"
+              @change="getVehicle"
             >
               <el-option
                 v-for="item in dict.vehicle_type"
@@ -26,10 +80,14 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="载具数量" prop="num">
+            <el-input-number :precision="0" :min="1" :max="99" v-model="form.num" style="width: 200px;" />
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button type="info" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">生成</el-button>
+          <el-button type="primary" @click="addAndprint">生成并打印</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -41,13 +99,14 @@
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="update_optname" label="修改人" />
+        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="update_time" label="修改时间" />
+        <el-table-column prop="create_time" label="创建时间" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
               :permission="permission"
+              :is-visiable-edit="false"
             />
           </template>
         </el-table-column>
@@ -65,15 +124,29 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 
-const defaultForm = { vehicle_id: null, vehicle_code: null, vehicle_name: null, one_code: null, two_code: null, rfid_code: null, vehicle_type: null, vehicle_width: null, vehicle_long: null, vehicle_height: null, overstruct_type: null, occupystruct_qty: null, ext_id: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+const defaultForm = { num: 1, vehicle_id: null, vehicle_code: null, vehicle_name: null, one_code: null, two_code: null, rfid_code: null, vehicle_type: null, vehicle_width: null, vehicle_long: null, vehicle_height: null, overstruct_type: null, occupystruct_qty: null, ext_id: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
 export default {
   name: 'Vehicle',
   dicts:['vehicle_type'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({ title: '载具维护', url: 'api/vehicle', idField: 'vehicle_id', sort: 'vehicle_id,desc', crudMethod: { ...crudVehicle }})
+    return CRUD({
+      title: '载具维护',
+      url: 'api/vehicle',
+      idField: 'vehicle_id',
+      sort: 'vehicle_id,desc',
+      crudMethod: { ...crudVehicle },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }
+    })
   },
   data() {
     return {
@@ -98,6 +171,65 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    hand() {
+      this.crud.toQuery()
+    },
+    getVehicle(code) {
+      if (!code) {
+        this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
+        this.form.vehicle_code = ''
+        return false
+      }
+      crudVehicle.getVehicle(code).then(res => {
+        this.form.vehicle_code = res.value
+      })
+    },
+    addAndprint() {
+      const data = this.form
+      if (!this.form.vehicle_type) {
+        this.crud.notify('载具类型不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (!this.form.num) {
+        this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      crudVehicle.add(data).then(res => {
+        res.forEach((item) => {
+          const LODOP = getLodop()
+          LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+          // 打印纸张大小设置https://www.it610.com/article/2094844.html
+          LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '1')
+          // LODOP.ADD_PRINT_RECT('0mm', '0mm', '50mm', '30mm', 0, 1)
+          LODOP.ADD_PRINT_BARCODE('4.3mm', '6.2mm', '40mm', '20mm', '128Auto', item)
+          // LODOP.PREVIEW()// 预览
+          LODOP.PRINT()// 打印
+        })
+        this.crud.status.add = CRUD.STATUS.NORMAL
+        this.crud.toQuery()
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    },
+    print() {
+      const _selectData = this.$refs.table.selection
+      if (!_selectData || _selectData.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      for (let i = 0; i < _selectData.length; i++) {
+        const code = _selectData[i].vehicle_code
+        const LODOP = getLodop()
+        LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+        // 打印纸张大小设置https://www.it610.com/article/2094844.html
+        LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '')
+        // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1)
+        LODOP.ADD_PRINT_BARCODE('4.3mm', '8.2mm', '40mm', '20mm', '128Auto', code)
+        // LODOP.PREVIEW()// 预览
+        LODOP.PRINT()// 打印
+        this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      }
     }
   }
 }

lms/nladmin-ui/src/views/wms/basedata/vehicle/vehicle.js

@@ -24,4 +24,11 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function getVehicle(code) {
+  return request({
+    url: 'api/vehicle/getVehicle/' + code,
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, getVehicle }