diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java index a27e9273..eeabc0cb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java @@ -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")), //单据类型 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/pda/PdaStBcpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/pda/PdaStBcpInController.java new file mode 100644 index 00000000..87fe74f2 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/pda/PdaStBcpInController.java @@ -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.*; + +/** + *

+ * 一体机半成品入库 前端控制器 + *

+ * + * @author Liuxy + * @since 2023-06-27 + */ +@RestController +@RequestMapping("/api/pda/bcp") +public class PdaStBcpInController { + + @Autowired + private PdaStBcpInService pdaStBcpInService; + + @PostMapping("/getBcpStor") + @Log("查询半成品仓库") + @ApiOperation("查询半成品仓库") + public ResponseEntity getBcpIvtInfo() { + return new ResponseEntity<>(pdaStBcpInService.getBcpIvtInfo(), HttpStatus.OK); + } + + @PostMapping("/getBillType") + @Log("查询单据类型") + @ApiOperation("查询单据类型") + public ResponseEntity getBillType() { + return new ResponseEntity<>(pdaStBcpInService.getBillType(), HttpStatus.OK); + } +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/PdaStBcpInService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/PdaStBcpInService.java new file mode 100644 index 00000000..b3c9e38a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/PdaStBcpInService.java @@ -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; + +/** + *

+ * 一体机半成品入库 服务类 + *

+ * + * @author Liuxy + * @since 2023-06-27 + */ +public interface PdaStBcpInService { + + /* + 查询半成品仓库 + */ + JSONObject getBcpIvtInfo(); + + /* + 查询单据类型 + */ + JSONObject getBillType(); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/impl/PdaStBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/impl/PdaStBcpInServiceImpl.java new file mode 100644 index 00000000..8ba181e8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/pda/impl/PdaStBcpInServiceImpl.java @@ -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; + +/** + *

+ * 一体机半成品入库 服务实现类 + *

+ * + * @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 storList = storattrService.list( + new QueryWrapper().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 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; + } +} diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue index 51921ab0..e8f908b4 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue @@ -72,7 +72,7 @@ :disabled="crud.status.view > 0" >