root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: 一体机成品入库

Browse Source
This commit is contained in:
liuxy
2023-06-27 16:48:40 +08:00
parent b49adc53e6
commit c75f83cb0c
7 changed files with 164 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java
View File

@@ -19,6 +19,8 @@ public enum IOSEnum {
IO_TYPE(MapOf.of("入库", "0", "出库", "1")),
//是否
IS_USED(MapOf.of("是", "1", "否", "0")),
//仓库编码
STOR_CODE(MapOf.of("原材料仓", "1528627964823080960", "半成品仓库", "15286279952695336962","成品库", "1528627995269533696")),
//托盘超限类型
VEHICLE_OVER_TYPE(MapOf.of("标准", "00", "横向超", "01","纵向超","02")),
//单据类型

45
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/pda/PdaStBcpInController.java Normal file
View File

@@ -0,0 +1,45 @@
package org.nl.wms.storage_manage.semimanage.controller.pda;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import org.nl.common.anno.Log;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.semimanage.service.pda.PdaStBcpInService;
import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
/**
* <p>
* 一体机半成品入库 前端控制器
* </p>
*
* @author Liuxy
* @since 2023-06-27
*/
@RestController
@RequestMapping("/api/pda/bcp")
public class PdaStBcpInController {
@Autowired
private PdaStBcpInService pdaStBcpInService;
@PostMapping("/getBcpStor")
@Log("查询半成品仓库")
@ApiOperation("查询半成品仓库")
public ResponseEntity<Object> getBcpIvtInfo() {
return new ResponseEntity<>(pdaStBcpInService.getBcpIvtInfo(), HttpStatus.OK);
}
@PostMapping("/getBillType")
@Log("查询单据类型")
@ApiOperation("查询单据类型")
public ResponseEntity<Object> getBillType() {
return new ResponseEntity<>(pdaStBcpInService.getBillType(), HttpStatus.OK);
}
}

33
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/PdaStBcpInService.java Normal file
View File

@@ -0,0 +1,33 @@
package org.nl.wms.storage_manage.semimanage.service.pda;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* <p>
* 一体机半成品入库 服务类
* </p>
*
* @author Liuxy
* @since 2023-06-27
*/
public interface PdaStBcpInService {
/*
查询半成品仓库
*/
JSONObject getBcpIvtInfo();
/*
查询单据类型
*/
JSONObject getBillType();
}

77
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/impl/PdaStBcpInServiceImpl.java Normal file
View File

@@ -0,0 +1,77 @@
package org.nl.wms.storage_manage.semimanage.service.pda.impl;
import com.alibaba.fastjson.JSON;
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 com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.semimanage.service.pda.PdaStBcpInService;
import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper.StIvtStructivtBcpMapper;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dto.StructIvtBcpQuery;
import org.nl.wms.system_manage.service.dict.ISysDictService;
import org.nl.wms.system_manage.service.dict.dao.Dict;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
* 一体机半成品入库 服务实现类
* </p>
*
* @author Liuxy
* @since 2023-06-27
*/
@Service
public class PdaStBcpInServiceImpl implements PdaStBcpInService {
@Autowired
private IStIvtStructattrService structattrService; // 仓位服务
@Autowired
private IStIvtBsrealstorattrService storattrService; // 实物属性服务
@Autowired
private ISysDictService iSysDictService; // 字典服务
@Override
public JSONObject getBcpIvtInfo() {
List<StIvtBsrealstorattr> storList = storattrService.list(
new QueryWrapper<StIvtBsrealstorattr>().lambda()
.eq(StIvtBsrealstorattr::getIs_used, IOSEnum.IS_USED.code("是"))
.eq(StIvtBsrealstorattr::getStor_id, IOSEnum.STOR_CODE.code("半成品仓库"))
);
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(storList)));
result.put("message", "查询成功");
return result;
}
@Override
public JSONObject getBillType() {
List<Dict> dictList = iSysDictService.getDictByName("ST_INV_BCP_IN_TYPE");
JSONObject result = new JSONObject();
result.put("data", JSONArray.parseArray(JSON.toJSONString(dictList)));
result.put("message", "查询成功");
return result;
}
}

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue
View File

@@ -72,7 +72,7 @@
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in dict.bill_type"
v-for="item in dict.ST_INV_BCP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -246,7 +246,7 @@ export default {
name: 'AddDialog',
components: {MaterDtl},
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_BCP_IN_TYPE', 'product_area'],
cruds() {
return CRUD({title: '入库新增', crudMethod: {...crudsemiproductIn}})
},

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog.vue
View File

@@ -51,7 +51,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_BCP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -140,7 +140,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status'],
dicts: ['ST_INV_BCP_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status'],
props: {
dialogShow: {
type: Boolean,

6
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue
View File

@@ -40,7 +40,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_BCP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -221,7 +221,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_IN_TYPE', 'ST_INV_CREATE'],
dicts: ['IO_BILL_STATUS', 'product_area', 'ST_INV_BCP_IN_TYPE', 'ST_INV_CREATE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -301,7 +301,7 @@ export default {
}
},
bill_typeFormat(row, column) {
return this.dict.label.bill_type[row.bill_type]
return this.dict.label.ST_INV_BCP_IN_TYPE[row.bill_type]
},
toView(row) {
this.mstrow = row