add:容器

This commit is contained in:
2024-03-08 17:45:17 +08:00
parent 3cba8bcc34
commit d55203c02e
23 changed files with 1233 additions and 57 deletions

View File

@@ -0,0 +1,84 @@
package org.nl.wms.base_manage.vehicle.controller;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* <p>
* 载具信息表 前端控制器
* </p>
*
* @author generator
* @since 2023-05-10
*/
@RestController
@RequestMapping("api/bmVehicleInfo")
public class BmVehicleInfoController {
@Autowired
private IBmVehicleInfoService vehicleInfoService;
@GetMapping("/vehicleInfo")
public ResponseEntity<Object> vehicleInfo(String vehicle_code) {
return new ResponseEntity<>(vehicleInfoService.vehileInfo(vehicle_code), HttpStatus.OK);
}
@GetMapping
@Log("查询载具")
public ResponseEntity<Object> query(VehicleQuery whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(vehicleInfoService.queryAll(whereJson, page)), HttpStatus.OK);
}
@PostMapping
@Log("新增载具")
public ResponseEntity<Object> create(@RequestBody JSONObject map) {
return new ResponseEntity<>(vehicleInfoService.create(map), HttpStatus.CREATED);
}
@PutMapping
@Log("修改载具")
public ResponseEntity<Object> update(@Validated @RequestBody JSONObject dto) {
vehicleInfoService.update(dto);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除载具")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
vehicleInfoService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PutMapping("/changeActive")
@Log("修改点位启用状态")
public ResponseEntity<Object> changeActive(@RequestBody JSONObject json) {
vehicleInfoService.changeActive(json);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@GetMapping("/getVehicle/{code}")
@Log("获取起始载具号")
public ResponseEntity<Object> getVehicle(@PathVariable String code) {
JSONObject json = vehicleInfoService.getVehicle(code);
return new ResponseEntity<>(json, HttpStatus.OK);
}
@PostMapping("/updateVehicleMaterial")
public ResponseEntity<Object> updateVehicleInfo(@RequestBody JSONObject form) {
vehicleInfoService.updateVehicleMaterial(form);
return new ResponseEntity<>(HttpStatus.OK);
}
}

View File

@@ -0,0 +1,91 @@
package org.nl.wms.base_manage.vehicle.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery;
import java.util.List;
import java.util.Map;
/**
* <p>
* 载具信息表 服务类
* </p>
*
* @author generator
* @since 2023-05-10
*/
public interface IBmVehicleInfoService extends IService<BmVehicleInfo> {
/**
* 创建
* @param map /
*/
JSONArray create(JSONObject map);
/**
* 获取载具上物料信息
* @param vehile_code
* @return
*/
Map vehileInfo(String vehile_code);
void updateVehicleMaterial(JSONObject vorm);
/**
* 查询数据分页
* @param query 条件
* @param page 分页参数
* @return Map<String,Object>
*/
Page queryAll(VehicleQuery query, PageQuery page);
/**
* 查询所有数据不分页
* @param whereJson 条件参数
* @return List<StoragevehicleinfoDto>
*/
List<BmVehicleInfo> queryAll(Map whereJson);
/**
* 根据ID查询
* @param storagevehicle_id ID
* @return BmVehicleInfo
*/
Object findById(Long storagevehicle_id);
/**
* 根据编码查询
* @param code code
* @return BmVehicleInfo
*/
Object findByCode(String code);
/**
* 编辑
* @param dto /
*/
void update(JSONObject dto);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Long[] ids);
/**
* 多修改启用状态
* @param json /
*/
void changeActive(JSONObject json);
/**
* 获取起始载具号
* @param code /
*/
JSONObject getVehicle(String code);
}

View File

@@ -0,0 +1,139 @@
package org.nl.wms.base_manage.vehicle.service.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 载具信息表
* </p>
*
* @author generator
* @since 2023-05-10
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("bm_vehicle_info")
public class BmVehicleInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 载具标识
*/
@TableId
private String storagevehicle_id;
/**
* 载具编码
*/
private String storagevehicle_code;
/**
* 载具名称
*/
private String storagevehicle_name;
/**
* 一维码
*/
private String one_code;
/**
* 二维码
*/
private String two_code;
/**
* RFID编码
*/
private String rfid_code;
/**
* 创建人
*/
private String create_id;
/**
* 创建人姓名
*/
private String create_name;
/**
* 创建时间
*/
private String create_time;
/**
* 修改人
*/
private String update_id;
/**
* 修改人姓名
*/
private String update_name;
/**
* 修改时间
*/
private String update_time;
/**
* 是否启用
*/
private Boolean is_used;
/**
* 载具类型
*/
private String storagevehicle_type;
/**
* 载具宽度
*/
private BigDecimal vehicle_width;
/**
* 载具重量(kg)
*/
private BigDecimal vehicle_weight;
/**
* 载具长度
*/
private BigDecimal vehicle_long;
/**
* 载具高度
*/
private BigDecimal vehicle_height;
/**
* 载具是否超仓位
*/
private String overstruct_type;
/**
* 占仓位数
*/
private BigDecimal occupystruct_qty;
/**
* 外部标识
*/
private String ext_id;
}

View File

@@ -0,0 +1,19 @@
package org.nl.wms.base_manage.vehicle.service.dao.mapper;
import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.Map;
/**
* <p>
* 载具信息表 Mapper 接口
* </p>
*
* @author generator
* @since 2023-05-10
*/
public interface BmVehicleInfoMapper extends BaseMapper<BmVehicleInfo> {
Map vehileInfo(String vehicle_code);
}

View File

@@ -0,0 +1,13 @@
<?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="org.nl.wms.base_manage.vehicle.service.dao.mapper.BmVehicleInfoMapper">
<select id="vehileInfo" resultType="java.util.Map">
select *
from md_pb_storagevehicleinfo
left join md_pb_storagevehicleext
on md_pb_storagevehicleinfo.storagevehicle_code = md_pb_storagevehicleext.storagevehicle_code
where md_pb_storagevehicleinfo.storagevehicle_code = #{vehicle_code}
and md_pb_storagevehicleinfo.is_delete = false
</select>
</mapper>

View File

@@ -0,0 +1,25 @@
package org.nl.wms.base_manage.vehicle.service.dto;
import lombok.Data;
import org.nl.common.domain.entity.BaseQuery;
import org.nl.common.domain.entity.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class VehicleQuery extends BaseQuery<BmVehicleInfo> {
private String storagevehicle_code_begin;
private String storagevehicle_code_end;
private String storagevehicle_type;
@Override
public void paramMapping() {
super.doP.put("storagevehicle_code_begin", QParam.builder().k(new String[]{"storagevehicle_code"}).type(QueryTEnum.LT).build());
super.doP.put("storagevehicle_code_end", QParam.builder().k(new String[]{"storagevehicle_code"}).type(QueryTEnum.LE).build());
}
}

View File

@@ -0,0 +1,211 @@
package org.nl.wms.base_manage.vehicle.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
import org.nl.wms.base_manage.vehicle.service.dao.mapper.BmVehicleInfoMapper;
import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 载具信息表 服务实现类
* </p>
*
* @author generator
* @since 2023-05-10
*/
@Service
public class BmVehicleInfoServiceImpl extends ServiceImpl<BmVehicleInfoMapper, BmVehicleInfo> implements IBmVehicleInfoService {
/* @Autowired
private MdPbStoragevehicleextServiceImpl storagevehicleextService;
@Autowired
protected IMdMeMaterialbaseService iMdMeMaterialbaseService;*/
@Override
public Map vehileInfo(String vehicle_code) {
if(StringUtils.isEmpty(vehicle_code)){
return new HashMap();
}
return this.baseMapper.vehileInfo(vehicle_code);
}
@Override
public JSONArray create(JSONObject map) {
BmVehicleInfo one = this.getOne(new QueryWrapper<BmVehicleInfo>().eq("storagevehicle_code", map.getString("storagevehicle_code")));
if (!ObjectUtil.isEmpty(one)) {
throw new BadRequestException("此载具已存在");
}
String code = "";
switch (map.getString("storagevehicle_type")) {
case "00":
code = "VEHICCLE_CODE_XMTPT";
break;
case "01":
code = "VEHICCLE_CODE_CDMTP";
break;
case "02":
code = "VEHICCLE_CODE_TLD";
break;
case "03":
code = "VEHICCLE_CODE_TTP";
break;
case "04":
code = "VEHICCLE_CODE_XMTPC";
break;
case "05":
code = "VEHICCLE_CODE_LX";
break;
}
JSONArray resultCodeArr = new JSONArray();
int num = MapUtil.getInt(map, "num");
for (int i = 0; i < num; i++) {
BmVehicleInfo entity = new BmVehicleInfo();
entity.setStoragevehicle_id(IdUtil.getStringId());
/*entity.setStoragevehicle_code(CodeUtil.getNewCode(code));*/
entity.setStoragevehicle_name(entity.getStoragevehicle_code());
entity.setCreate_id(SecurityUtils.getCurrentUserId());
entity.setCreate_name(SecurityUtils.getCurrentNickName());
entity.setCreate_time(DateUtil.now());
entity.setIs_used(map.getString("is_used").equals("1"));
entity.setStoragevehicle_type(map.getString("storagevehicle_type"));
this.save(entity);
resultCodeArr.add(entity.getStoragevehicle_code());
}
return resultCodeArr;
}
@Override
@Transactional
public void updateVehicleMaterial(JSONObject vorm) {
/* Assert.notNull(vorm.getString("storagevehicle_code"),"请求参数载具编号不能为空");
storagevehicleextService.remove(new QueryWrapper<MdPbStoragevehicleext>()
.eq("storagevehicle_code",vorm.getString("storagevehicle_code")));
if (StringUtils.isEmpty(vorm.getString("material_code"))){
return;
}
MdMeMaterialbase one = iMdMeMaterialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>()
.eq("material_code", vorm.getString("material_code"))
.eq("is_delete",false));
if (one==null){
throw new BadRequestException("当前物料编号不存在:"+vorm.getString("material_code"));
}
MdPbStoragevehicleext vehicleMaterial = new MdPbStoragevehicleext();
vehicleMaterial.setStoragevehicle_id(vorm.getString("storagevehicle_id"));
vehicleMaterial.setStoragevehicle_code(vorm.getString("storagevehicle_code"));
vehicleMaterial.setStorage_qty(vorm.getBigDecimal("storage_qty"));
vehicleMaterial.setWeight(vorm.getBigDecimal("weight"));
vehicleMaterial.setMaterial_id(one.getMaterial_id());
vehicleMaterial.setMaterial_code(one.getMaterial_code());
vehicleMaterial.setMaterial_spec(one.getMaterial_spec());
vehicleMaterial.setQty_unit_id(one.getBase_unit_id());
vehicleMaterial.setPcsn(vorm.getString("pcsn"));
vehicleMaterial.setUpdate_id(SecurityUtils.getCurrentUserId());
vehicleMaterial.setUpdate_name(SecurityUtils.getCurrentNickName());
vehicleMaterial.setUpdate_time(DateUtil.now());
storagevehicleextService.save(vehicleMaterial);*/
}
@Override
public Page queryAll(VehicleQuery query, PageQuery page) {
return this.page(page.build(), query.build());
}
@Override
public List<BmVehicleInfo> queryAll(Map whereJson) {
List<BmVehicleInfo> list = this.list();
return list;
}
@Override
public Object findById(Long storagevehicle_id) {
return this.getOne(new QueryWrapper<BmVehicleInfo>().eq("storagevehicle_id",storagevehicle_id));
}
@Override
public Object findByCode(String code) {
return this.getOne(new QueryWrapper<BmVehicleInfo>().eq("storagevehicle_code",code));
}
@Override
public void update(JSONObject dto) {
BmVehicleInfo entity = dto.toJavaObject(BmVehicleInfo.class);
this.updateById(entity);
}
@Override
public void deleteAll(Long[] ids) {
if (ids.length>0){
this.removeByIds(Arrays.asList(ids));
}
}
@Override
public void changeActive(JSONObject json) {
BmVehicleInfo entity = json.toJavaObject(BmVehicleInfo.class);
entity.setUpdate_id(SecurityUtils.getCurrentUserId());
entity.setUpdate_time(DateUtil.now());
entity.setUpdate_name(SecurityUtils.getCurrentNickName());
this.updateById(entity);
}
@Override
public JSONObject getVehicle(String code) {
String term = "";
switch (code) {
case "00":
term = "VEHICCLE_CODE_XMTPT";
break;
case "01":
term = "VEHICCLE_CODE_CDMTP";
break;
case "02":
term = "VEHICCLE_CODE_TLD";
break;
case "03":
term = "VEHICCLE_CODE_TTP";
break;
case "04":
term = "VEHICCLE_CODE_XMTPC";
break;
case "05":
term = "VEHICCLE_CODE_LX";
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;
}
}

View File

@@ -38,7 +38,7 @@
</template>
<script>
import crudCustomerbase from '@/api/wms/basedata/master/customerbase'
import crudCustomerbase from '@/views/wms/base_manage/customer/customer'
import CRUD, { crud } from '@crud/crud'
import { download2 } from '@/api/data'
import { downloadFile } from '@/utils'
@@ -108,7 +108,6 @@ export default {
this.$emit('tableChanged3', '')
this.$emit('update:dialogShow', false)
}).catch(err => {
const list = err.response.data.message
download2('/api/produceWorkorder/download', list).then(result => {
downloadFile(result, '错误信息汇总', 'xlsx')

View File

@@ -13,7 +13,7 @@
/>
<rrOperation />
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" >
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
@@ -170,12 +170,12 @@
<!--分页组件-->
<pagination />
</div>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()" />
</div>
</template>
<script>
import crudCustomerbase from '@/api/wms/base_manage/customer/customer'
import crudCustomerbase from '@/views/wms/base_manage/customer/customer'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -215,7 +215,7 @@ const defaultForm = {
export default {
name: 'Customerbase',
dicts: ['is_used'],
components: {UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect },
components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -273,7 +273,7 @@ export default {
},
[CRUD.HOOK.afterToCU](crud, form) {
if (form.class_id != null) {
this.getSubTypes({'id':form.class_id,'parent_id':"1704039126057226240"})
this.getSubTypes({ 'id': form.class_id, 'parent_id': '1704039126057226240' })
} else {
this.getClass()
}
@@ -296,7 +296,7 @@ export default {
})
},
getClass() {
//queryClassById?class_idStr=1528555443906023424
// queryClassById?class_idStr=1528555443906023424
crudClassstandard.queryClassById({ enabled: true, 'class_idStr': '1704039126057226240' }).then(res => {
this.classes = res.content.map(function(obj) {
if (obj.hasChildren) {

View File

@@ -114,7 +114,7 @@
<script>
import CRUD, { crud, header, presenter } from '@crud/crud'
import crudFieldMapping from '@/api/wms/base_manage/field_mapping/fieldMapping'
import crudFieldMapping from '@/views/wms/base_manage/field_mapping/fieldMapping'
export default {
name: 'AddDtl',

View File

@@ -114,7 +114,7 @@
<script>
import CRUD, { crud, header, presenter } from '@crud/crud'
import crudFieldMapping from '@/api/wms/base_manage/field_mapping/fieldMapping'
import crudFieldMapping from '@/views/wms/base_manage/field_mapping/fieldMapping'
export default {
name: 'EditDtl',

View File

@@ -160,7 +160,7 @@
</template>
<script>
import crudFieldMapping from '@/api/wms/base_manage/field_mapping/fieldMapping'
import crudFieldMapping from '@/views/wms/base_manage/field_mapping/fieldMapping'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation.vue'
import crudOperation from '@crud/CRUD.operation.vue'

View File

@@ -38,7 +38,7 @@
</template>
<script>
import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import crudMaterialbase from '@/views/wms/base_manage/material/material'
import CRUD, { crud } from '@crud/crud'
import { download2 } from '@/api/data'
import { downloadFile } from '@/utils'

View File

@@ -187,7 +187,7 @@
</template>
<script>
import crudMaterialbase from '@/api/wms/base_manage/material/material'
import crudMaterialbase from '@/views/wms/base_manage/material/material'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'

View File

@@ -102,7 +102,7 @@
</template>
<script>
import crudMdPbMeasureunit from '@/api/wms/base_manage/measure/measureunit'
import crudMdPbMeasureunit from '@/views/wms/base_manage/measure/measureunit'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'

View File

@@ -11,9 +11,9 @@
prefix-icon="el-icon-search"
class="filter-item"
/>
<rrOperation/>
<rrOperation />
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -26,63 +26,63 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="供应商编码" prop="supp_code">
<el-input v-model="form.supp_code" style="width: 200px;"/>
<el-input v-model="form.supp_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="供应商名称 " prop="supp_name">
<el-input v-model="form.supp_name" style="width: 200px;"/>
<el-input v-model="form.supp_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="法人代表">
<el-input v-model="form.jurid_name" style="width: 200px;"/>
<el-input v-model="form.jurid_name" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="税务登记号">
<el-input v-model="form.tax_no" style="width: 200px;"/>
<el-input v-model="form.tax_no" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工商注册号">
<el-input v-model="form.register_no" style="width: 200px;"/>
<el-input v-model="form.register_no" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="经营许可证号">
<el-input v-model="form.manage_lice_no" style="width: 200px;"/>
<el-input v-model="form.manage_lice_no" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="营业执照">
<el-input v-model="form.busi_char_name" style="width: 200px;"/>
<el-input v-model="form.busi_char_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="条码打印起始值">
<el-input v-model="form.barcode_print" style="width: 200px;"/>
<el-input v-model="form.barcode_print" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮政编码">
<el-input v-model="form.zip_code" style="width: 200px;"/>
<el-input v-model="form.zip_code" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="公司电话">
<el-input v-model="form.corp_tele_no" style="width: 200px;"/>
<el-input v-model="form.corp_tele_no" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="公司地址">
<el-input v-model="form.corp_address" style="width: 200px;"/>
<el-input v-model="form.corp_address" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -95,12 +95,12 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="外部标识">
<el-input v-model="form.ext_id" style="width: 200px;"/>
<el-input v-model="form.ext_id" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资金计划履约天数">
<el-input v-model="form.honour_days" style="width: 200px;"/>
<el-input v-model="form.honour_days" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -116,7 +116,7 @@
</el-col>
</el-row>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 600px;" type="textarea"/>
<el-input v-model="form.remark" style="width: 600px;" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -133,13 +133,13 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="supp_code" label="供应商编码"/>
<el-table-column prop="supp_name" label="供应商名称 "/>
<el-table-column prop="corp_address" label="公司地址"/>
<el-table-column prop="corp_tele_no" label="公司电话"/>
<el-table-column prop="jurid_name" label="法人代表"/>
<el-table-column prop="update_optname" label="修改者"/>
<el-table-column prop="update_time" label="修改时间" width="150"/>
<el-table-column prop="supp_code" label="供应商编码" />
<el-table-column prop="supp_name" label="供应商名称 " />
<el-table-column prop="corp_address" label="公司地址" />
<el-table-column prop="corp_tele_no" label="公司电话" />
<el-table-column prop="jurid_name" label="法人代表" />
<el-table-column prop="update_optname" label="修改者" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column label="启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -167,20 +167,20 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>
<script>
import crudSupplierbase from '@/api/wms/base_manage/supplier/supplier'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import crudSupplierbase from '@/views/wms/base_manage/supplier/supplier'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
const defaultForm = {
@@ -213,7 +213,7 @@ const defaultForm = {
}
export default {
name: 'Supplier',
components: {pagination, crudOperation, rrOperation, udOperation, Treeselect},
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [presenter(), header(), form(defaultForm), crud()],
// 数据字典
dicts: ['is_used'],
@@ -227,7 +227,7 @@ export default {
},
idField: 'supp_id',
sort: 'supp_id,desc',
crudMethod: {...crudSupplierbase}
crudMethod: { ...crudSupplierbase }
})
},
data() {
@@ -236,28 +236,28 @@ export default {
classes: [],
rules: {
supp_code: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
],
supp_name: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_id: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_name: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_time: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
],
is_used: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
],
is_delete: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
],
class_id: [
{required: true, message: '不能为空', trigger: 'blur'}
{ required: true, message: '不能为空', trigger: 'blur' }
]
}
}
@@ -269,7 +269,7 @@ export default {
},
[CRUD.HOOK.afterToCU](crud, form) {
if (form.class_id != null) {
this.getSubTypes({'id': form.class_id, 'parent_id': "1704039126057226240"})
this.getSubTypes({ 'id': form.class_id, 'parent_id': '1704039126057226240' })
} else {
this.getClass()
}
@@ -292,8 +292,8 @@ export default {
})
},
getClass() {
crudClassstandard.queryClassById({enabled: true, 'class_idStr': '1704039126057226240'}).then(res => {
this.classes = res.content.map(function (obj) {
crudClassstandard.queryClassById({ enabled: true, 'class_idStr': '1704039126057226240' }).then(res => {
this.classes = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
@@ -302,10 +302,10 @@ export default {
})
},
// 获取弹窗内部门数据
loadClass({action, parentNode, callback}) {
loadClass({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({pid: parentNode.id}).then(res => {
parentNode.children = res.content.map(function (obj) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}

View File

@@ -0,0 +1,539 @@
<template>
<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.storagevehicle_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 180px;"
@change="hand"
>
<el-option
v-for="item in dict.storagevehicle_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="载具号">
<el-input
v-model="query.storagevehicle_code_begin"
clearable
size="mini"
placeholder="起始载具号"
style="width: 110px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
-
<el-input
v-model="query.storagevehicle_code_end"
clearable
size="mini"
placeholder="结束载具号"
style="width: 110px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-printer"
size="mini"
@click="printView"
>
打印
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:visible.sync="dialogVisible"
title="载具物料信息"
width="540px"
@close="materiValueCancel()"
>
<el-form ref="form" :model="materialForm" :rules="rules" size="mini" label-width="110px">
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="materialForm.storagevehicle_code" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<template slot-scope="scope">
<el-input v-model="materialForm.material_code" clearable style="width: 370px" @clear="materialForm.material_id='',materialForm.material_code='',materialForm.material_name='',materialForm.material_spec=''">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
</el-input>
</template>
</el-form-item>
<el-form-item label="物料规格" prop="material_spec">
<el-input v-model="materialForm.material_spec" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料数量" prop="storage_qty">
<el-input v-model="materialForm.storage_qty" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="物料重量" prop="weight">
<el-input v-model="materialForm.weight" clearable style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="materiValueCancel()">取消</el-button>
<el-button type="primary" @click="materiValueSubmit()">确认</el-button>
</div>
</el-dialog>
<el-dialog
:close-on-click-modal="false"
:visible.sync="pointMVisible"
title="载具信息"
width="540px"
@close="materiValueCancel()"
>
<el-form ref="form" :model="updateForm" :rules="rules" size="mini" label-width="110px">
<el-form-item label="载具编号" prop="storagevehicle_code">
<template slot-scope="scope">
<el-input v-model="updateForm.storagevehicle_code" clearable />
</template>
</el-form-item>
<el-form-item label="载具重量(g)" prop="vehicle_weight">
<el-input-number v-model="updateForm.vehicle_weight" clearable style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="materiValueCancel()">取消</el-button>
<el-button type="primary" @click="pointMateriSubmit()">确认</el-button>
</div>
</el-dialog>
<el-dialog
:before-close="crud.cancelCU"
:close-on-click-modal="false"
title="打印配置"
:visible.sync="printVisible"
width="450px"
>
<el-form ref="form" :model="printForm" size="mini" label-width="150px">
<el-form-item label="纸张高度(mm)" prop="pageh">
<el-input v-model="printForm.pageh" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="纸张宽度(mm)" prop="pagew">
<el-input v-model="printForm.pagew" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="页边距top(mm)" prop="pagetop">
<el-input v-model="printForm.pagetop" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="页边距right(mm)" prop="pageright">
<el-input v-model="printForm.pageright" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="页边距down(mm)" prop="pagedown">
<el-input v-model="printForm.pagedown" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="页边距left(mm)" prop="pageleft">
<el-input v-model="printForm.pageleft" :precision="0" style="width: 150px;" />
</el-form-item>
<br>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="printClose">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="print">打印</el-button>
</div>
</el-dialog>
<el-dialog
:before-close="crud.cancelCU"
:close-on-click-modal="false"
:title="crud.status.title"
:visible.sync="crud.status.cu > 0"
width="450px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="载具类型" prop="storagevehicle_type">
<el-select
v-model="form.storagevehicle_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 250px;"
@change="getVehicle"
>
<el-option
v-for="item in dict.storagevehicle_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<br>
<el-form-item label="起始载具号" prop="storagevehicle_code">
<el-input v-model="form.storagevehicle_code" :disabled="true" style="width: 250px;" />
</el-form-item>
<el-form-item label="载具数量" prop="num">
<el-input-number v-model="form.num" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item label="是否启用">
<el-radio v-model="form.is_used" label="0">否</el-radio>
<el-radio v-model="form.is_used" label="1">是</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="crud.cancelCU">取消</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>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
<el-table-column prop="storagevehicle_type" label="载具类型">
<template slot-scope="scope">
{{ dict.label.storagevehicle_type[scope.row.storagevehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="storagevehicle_code" label="载具编码">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row.storagevehicle_code)">{{ scope.row.storagevehicle_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="storagevehicle_name" label="载具名称" />
<el-table-column prop="vehicle_weight" label="载具单重(g)" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
v-model="scope.row.is_used"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column
v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
label="操作"
width="200px"
align="center"
fixed="right"
>
<template slot-scope="scope">
<el-button icon="el-icon-position" type="text" class="filter-item" size="mini" @click="updateweight(scope.row)">修改</el-button>
<udOperation
:data="scope.row"
:permission="permission"
:is-visiable-edit="false"
class="filter-item"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<!-- <MaterDtl-->
<!-- :dialog-show.sync="materialShow"-->
<!-- :is-single="true"-->
<!-- :mater-opt-code="materType"-->
<!-- @setMaterValue="setMaterValue"-->
<!-- />-->
<pagination />
</div>
</div>
</template>
<script>
import crudStoragevehicleinfo from '@/views/wms/base_manage/vehicle/vehicle'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
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'
// import MaterDtl from '@/views/wms/pub/MaterDialog'
const defaultForm = {
storagevehicle_id: null,
storagevehicle_code: null,
storagevehicle_name: null,
one_code: null,
two_code: null,
rfid_code: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
is_delete: null,
is_used: '1',
storagevehicle_type: null,
vehicle_width: null,
vehicle_long: null,
vehicle_height: null,
overstruct_type: null,
occupystruct_qty: null,
ext_id: null,
num: '1'
}
export default {
name: 'Storagevehicleinfo',
dicts: ['storagevehicle_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '载具',
url: 'api/bmVehicleInfo',
idField: 'storagevehicle_id',
sort: 'storagevehicle_id,desc',
crudMethod: { ...crudStoragevehicleinfo },
optShow: {
add: true,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
var numberOne = (rule, value, callback) => {
const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
const numRe = new RegExp(numReg)
if (!numRe.test(value)) {
callback(new Error('只能输入数字'))
} else {
callback()
}
}
return {
printVisible: false,
updateForm: {},
printForm: {
pageh: '40mm',
pagew: '60mm',
pagetop: '4.3mm',
pagedown: '50mm',
pageright: '30mm',
pageleft: '8mm'
},
pointMVisible: false,
materType: '01',
materialShow: false,
dialogVisible: false,
materialForm: {},
resultCodeArr: [],
permission: {},
rules: {
storagevehicle_code: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_name: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_time: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
is_delete: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
is_used: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
storagevehicle_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
overstruct_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
num: [
{ required: true, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
]
}
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
queryMater(index, row) {
this.materialShow = true
},
setMaterValue(row) {
this.$set(this.materialForm, 'material_code', row.material_code)
this.$set(this.materialForm, 'material_spec', row.material_spec)
},
materiValueCancel() {
this.updateForm = {}
this.pointMVisible = false
},
materiValueSubmit() {
console.log(this.updateForm)
// crudStoragevehicleinfo.updateVehicleMaterial(this.materialForm).then(res => {
// this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
// this.materiValueCancel()
// }).catch(() => {
//
// })
},
hand(value) {
this.crud.toQuery()
},
changeEnabled(data, val) {
let msg = '此操作将停用载具,是否继续!'
if (val !== '1') {
msg = '此操作将启用载具,是否继续!'
}
this.$confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudStoragevehicleinfo.changeActive(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
data.is_used = !data.is_used
})
}).catch(() => {
})
},
format_is_used(is_used) {
return is_used === '1'
},
printView() {
this.printForm = {
pageh: '40mm',
pagew: '60mm',
pagetop: '4.3mm',
pagedown: '50mm',
pageright: '30mm',
pageleft: '8mm'
},
this.printVisible = true
},
printClose() {
this.printVisible = false
this.printForm = {
pageh: '40mm',
pagew: '60mm',
pagetop: '4.3mm',
pagedown: '50mm',
pageright: '30mm',
pageleft: '8mm'
}
},
print() {
this.printVisible = false
const _selectData = this.$refs.table.selection
if (!_selectData || _selectData.length < 1) {
this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
return
}
console.log(_selectData.length)
console.log(this.printForm)
for (let i = 0; i < _selectData.length; i++) {
const code = _selectData[i].storagevehicle_code
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
LODOP.SET_PRINT_PAGESIZE(1, this.printForm.pagew, this.printForm.pageh, '1')
// LODOP.ADD_PRINT_RECT('0mm', '0mm', '50mm', '30mm', 0, 1)
LODOP.ADD_PRINT_BARCODE(this.printForm.pagetop, this.printForm.pageleft, this.printForm.pagedown, this.printForm.pageright, '128Auto', code)
// LODOP.PREVIEW()// 预览
LODOP.PRINT()// 打印
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}
},
toView(row) {
crudStoragevehicleinfo.vehileInfo(row).then(data => {
this.dialogVisible = true
this.materialForm = data
})
},
updateweight(row) {
this.pointMVisible = true
this.updateForm = row
},
pointMateriSubmit() {
console.log(this.updateForm)
crudStoragevehicleinfo.edit(this.updateForm).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
this.updateForm = {}
this.pointMVisible = false
this.crud.refresh()
},
addAndprint() {
const data = this.form
if (!this.form.storagevehicle_type) {
this.crud.notify('载具类型不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.form.num) {
this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
crudStoragevehicleinfo.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, '60mm', '40mm', '1')
// LODOP.ADD_PRINT_RECT('0mm', '0mm', '50mm', '30mm', 0, 1)
LODOP.ADD_PRINT_BARCODE('4.3mm', '8mm', '50mm', '30mm', '128Auto', item)
// LODOP.PREVIEW()// 预览
LODOP.PRINT()// 打印
})
this.crud.status.add = CRUD.STATUS.NORMAL
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
getVehicle(code) {
if (!code) {
this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
this.form.storagevehicle_code = ''
return false
}
crudStoragevehicleinfo.getVehicle(code).then(res => {
this.form.storagevehicle_code = res.value
})
}
}
}
</script>
<style scoped>
</style>

View File

@@ -0,0 +1,56 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/bmVehicleInfo',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/bmVehicleInfo/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/bmVehicleInfo',
method: 'put',
data
})
}
export function changeActive(data) {
return request({
url: 'api/bmVehicleInfo/changeActive',
method: 'put',
data
})
}
export function getVehicle(code) {
return request({
url: 'api/bmVehicleInfo/getVehicle/' + code,
method: 'get'
})
}
export function vehileInfo(data) {
return request({
url: 'api/bmVehicleInfo/vehicleInfo?vehicle_code=' + data,
method: 'get'
})
}
export function updateVehicleMaterial(data) {
return request({
url: 'api/bmVehicleInfo/updateVehicleMaterial',
method: 'post',
data
})
}
export default { add, edit, del, changeActive, getVehicle, vehileInfo, updateVehicleMaterial }