diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java new file mode 100644 index 00000000..be8d7ec8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java @@ -0,0 +1,60 @@ +package org.nl.wms.storage_manage.basedata.controller.storage; + + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 实物库属性表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-04 + */ +@RequestMapping("/api/stIvtBsrealstorattr") +@RestController +@RequiredArgsConstructor +@Api(tags = "实物库属性表") +@Slf4j +public class StIvtBsrealstorattrController { + + @Autowired + protected IStIvtBsrealstorattrService stIvtBsrealstorattrService; + + + @PostMapping("/queryStor") + @Log("查询仓库") + @ApiOperation("查询仓库") + public ResponseEntity queryStor(@RequestBody JSONObject whereJson) { + List list; + //1虚拟库2半成品库3原料库4成品库5备件库 + String stor_type = whereJson.getString("stor_type"); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("is_used", true); + if (StrUtil.isNotEmpty(stor_type)) { + wrapper.eq("stor_type", stor_type); + } + list = stIvtBsrealstorattrService.list(wrapper); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); + } +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java new file mode 100644 index 00000000..01c1e1bb --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java @@ -0,0 +1,38 @@ +package org.nl.wms.storage_manage.basedata.controller.storage; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.nl.common.anno.Log; + +/** + *

+ * 仓位属性表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-04 + */ +@RestController +@RequestMapping("/api/stIvtStructattr") +public class StIvtStructattrController { + + @Autowired + protected IStIvtStructattrService iStIvtStructattrService; + + @PostMapping("/getSectCascader") + @Log("获取库区对应仓位下拉框-多级下拉框") + @ApiOperation("获取库区对应仓位下拉框-多级下拉框") + public ResponseEntity getSectCascader(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(iStIvtStructattrService.getSectCascader(whereJson), HttpStatus.OK); + } +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java new file mode 100644 index 00000000..91b648cc --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java @@ -0,0 +1,18 @@ +package org.nl.wms.storage_manage.basedata.service.storage; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr; + +/** + *

+ * 仓位属性表 服务类 + *

+ * + * @author generator + * @since 2023-05-04 + */ +public interface IStIvtStructattrService extends IService { + + JSONObject getSectCascader(JSONObject jo); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java new file mode 100644 index 00000000..2710a2c9 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java @@ -0,0 +1,68 @@ +package org.nl.wms.storage_manage.basedata.service.storage.impl; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.storage_manage.basedata.service.storage.IStIvtSectattrService; +import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtStructattrMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 仓位属性表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-04 + */ +@Service +public class StIvtStructattrServiceImpl extends ServiceImpl implements IStIvtStructattrService { + + @Autowired + private IStIvtSectattrService sectattrService; + @Autowired + private IStIvtStructattrService structattrService; + + @Override + public JSONObject getSectCascader(JSONObject jo) { + String stor_id = jo.getString("stor_id"); + if (StrUtil.isEmpty(stor_id)) { + stor_id = ""; + } + JSONArray cascader_ja = new JSONArray(); + List list = sectattrService.list(new QueryWrapper().eq("is_used", true) + .eq("stor_id", stor_id)); + list.forEach(sect -> { + JSONObject sect_cas = new JSONObject(); + sect_cas.put("value", sect.getSect_id()); + sect_cas.put("label", sect.getSect_name()); + List struct_list = structattrService.list(new QueryWrapper().eq("is_used", true) + .eq("sect_id", sect.getSect_id())); + if (struct_list.size() > 0) { + JSONArray struct_ja = new JSONArray(); + struct_list.forEach(struct -> { + JSONObject struct_cas = new JSONObject(); + struct_cas.put("value", struct.getStruct_id()); + struct_cas.put("label", struct.getStruct_name()); + struct_ja.add(struct_cas); + }); + sect_cas.put("children", struct_ja); + } + cascader_ja.add(sect_cas); + }); + JSONObject result = new JSONObject(); + result.put("content", cascader_ja); + return result; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java index 4070eeb8..62f055d9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java @@ -1,9 +1,22 @@ package org.nl.wms.storage_manage.rawmanage.controller.iostorInv; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.ApiOperation; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; /** *

@@ -14,8 +27,58 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-10 */ @RestController -@RequestMapping("/stIvtIostorinvYl") +@RequestMapping("/api/stIvtIostorinvYl") public class StIvtIostorinvYlController { + @Autowired + private IStIvtIostorinvYlService iostorinvYlService; + + @GetMapping + @Log("查询入库单") + @ApiOperation("查询入库单") + public ResponseEntity query(YlIostorInvQuery query, PageQuery page){ + return new ResponseEntity<>(iostorinvYlService.pageQuery(query,page),HttpStatus.OK); + } + + @PostMapping + @Log("创建入库单") + @ApiOperation("创建入库单") + public ResponseEntity create(@RequestBody JSONObject whereJson) { + iostorinvYlService.create(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/update") + @Log("修改入库单") + @ApiOperation("修改入库单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { + iostorinvYlService.updateBill(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/delete") + @Log("删除入库单") + @ApiOperation("删除入库单") + public ResponseEntity delete(@RequestBody Long[] ids){ + iostorinvYlService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/getIODtl") + @Log("查询入库分配明细") + @ApiOperation("查询入库分配明细") + public ResponseEntity getIODtl(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(iostorinvYlService.getInvDtl(whereJson), HttpStatus.OK); + } + + @PostMapping("/confirm") + @Log("强制确认") + @ApiOperation("强制确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { + iostorinvYlService.confirm(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvdisYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvdisYlController.java deleted file mode 100644 index d57935aa..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvdisYlController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.storage_manage.rawmanage.controller.iostorInv; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 出入库单分配表 前端控制器 - *

- * - * @author generator - * @since 2023-05-10 - */ -@RestController -@RequestMapping("/stIvtIostorinvdisYl") -public class StIvtIostorinvdisYlController { - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvdtlYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvdtlYlController.java deleted file mode 100644 index cdf52cea..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvdtlYlController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.storage_manage.rawmanage.controller.iostorInv; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 出入库单明细表 前端控制器 - *

- * - * @author generator - * @since 2023-05-10 - */ -@RestController -@RequestMapping("/stIvtIostorinvdtlYl") -public class StIvtIostorinvdtlYlController { - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvYlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvYlService.java index 40db35ab..9cd47f78 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvYlService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvYlService.java @@ -1,7 +1,15 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +21,48 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IStIvtIostorinvYlService extends IService { + /** + * 分页查询 + * @param query,page / + * @return JSONObject + */ + Object pageQuery(YlIostorInvQuery query, PageQuery page); + + /** + * 创建 + * + * @param form / + */ + void create(JSONObject form); + + /** + * 修改单据 + * @param form + * @return + */ + String updateBill(JSONObject form); + + /** + * 删除 + * @param ids + * { + * 主表id.. + * } + */ + void delete(Long[] ids); + + /** + * 获取分配明细 + * @param form + * @return + */ + List getInvDtl(JSONObject form); + + /** + * 强制确认 + * @param form + * @return + */ + void confirm(JSONObject form); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdisYlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdisYlService.java index 56dd7301..fa7624c6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdisYlService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdisYlService.java @@ -1,5 +1,7 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl; import com.baomidou.mybatisplus.extension.service.IService; @@ -12,5 +14,20 @@ import com.baomidou.mybatisplus.extension.service.IService; * @since 2023-05-10 */ public interface IStIvtIostorinvdisYlService extends IService { + /** + * 主单据使用 + * + * @param row + * @param mst_jo + * @return + */ + void create(JSONObject row, JSONObject mst_jo); + /** + * 根据主表删除明细 + * + * @param mst_id + * @return + */ + void deleteById(String mst_id); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdtlYlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdtlYlService.java index c16185dc..aab602d5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdtlYlService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/IStIvtIostorinvdtlYlService.java @@ -1,8 +1,13 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; +import java.util.Map; + /** *

* 出入库单明细表 服务类 @@ -13,4 +18,13 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IStIvtIostorinvdtlYlService extends IService { + /** + * 主单据使用 + * @param row + * @param iostorinvCp_id + * @return + */ + double create(JSONArray row, String iostorinvCp_id); + + List getDtlList(JSONObject json); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java index 31608a96..ad5c1cc5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvYl.java @@ -1,9 +1,14 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.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 com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,6 +30,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 出入单标识 */ + @TableId(value = "iostorinv_id") private String iostorinv_id; /** @@ -35,7 +41,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 出入类型 */ - private Boolean io_type; + private String io_type; /** * 业务类型 @@ -90,7 +96,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 明细数 */ - private BigDecimal detail_count; + private Integer detail_count; /** * 单据状态 @@ -115,6 +121,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date create_time; /** @@ -130,6 +137,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date update_time; /** @@ -145,6 +153,7 @@ public class StIvtIostorinvYl implements Serializable { /** * 分配时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date dis_time; /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java index 9ac6bac9..5fb0be2b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdisYl.java @@ -1,8 +1,11 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -39,7 +42,7 @@ public class StIvtIostorinvdisYl implements Serializable { /** * 明细序号 */ - private BigDecimal seq_no; + private Integer seq_no; /** * 库区标识 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java index 9011fd06..13248864 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/StIvtIostorinvdtlYl.java @@ -34,7 +34,7 @@ public class StIvtIostorinvdtlYl implements Serializable { /** * 明细序号 */ - private BigDecimal seq_no; + private Integer seq_no; /** * 物料标识 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvYlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvYlMapper.java index 600487fd..e41e9adf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvYlMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvYlMapper.java @@ -1,7 +1,13 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtIostorinvYlMapper extends BaseMapper { + List getMstDetail(@Param("query") YlIostorInvQuery query, @Param("pageQuery") PageQuery pageQuery); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlYlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlYlMapper.java index fabee82e..3c507562 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlYlMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlYlMapper.java @@ -1,8 +1,12 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; + /** *

* 出入库单明细表 Mapper 接口 @@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtIostorinvdtlYlMapper extends BaseMapper { + List getIostorinvdtl(Map query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml index 7113ab70..c25aa704 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvYlMapper.xml @@ -2,4 +2,62 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlYlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlYlMapper.xml index 835005ab..48e40ef8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlYlMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlYlMapper.xml @@ -2,4 +2,22 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dto/YlIostorInvQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dto/YlIostorInvQuery.java new file mode 100644 index 00000000..f982663f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/dto/YlIostorInvQuery.java @@ -0,0 +1,37 @@ +package org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class YlIostorInvQuery extends BaseQuery { + + + private String stor_id; + + private String bill_status; + + private String bill_type; + + private String bill_code; + + private String io_type; + + private Boolean is_delete = false; + + + @Override + public void paramMapping() { + super.doP.put("bill_code", QParam.builder().k(new String[]{"bill_code"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java index d183c479..3c93bc45 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java @@ -1,11 +1,41 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl; +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.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import io.jsonwebtoken.lang.Assert; +import org.jetbrains.annotations.NotNull; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; +import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr; +import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp; +import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvYlMapper; -import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dto.YlIostorInvQuery; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvdisBcp; +import org.nl.wms.system_manage.service.user.dto.SysUserDetail; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; +import java.util.Map; + /** *

* 出入库单主表 服务实现类 @@ -17,4 +47,119 @@ import org.springframework.stereotype.Service; @Service public class StIvtIostorinvYlServiceImpl extends ServiceImpl implements IStIvtIostorinvYlService { + @Autowired + private IStIvtBsrealstorattrService stIvtBsrealstorattrService; + + @Autowired + private IStIvtIostorinvdtlYlService iostorinvdtlYlService; + + @Autowired + private StIvtIostorinvYlMapper iostorinvYlMapper; + + + @Override + public Object pageQuery(YlIostorInvQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List mst_detail = iostorinvYlMapper.getMstDetail(query, pageQuery); + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } + + @Override + public void create(JSONObject form) { + JSONArray rows = form.getJSONArray("tableData"); + if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空"); + + // 调用主表 插入/更新方法 + StIvtIostorinvYl stIvtIostorinvYl = packageMstForm(new StIvtIostorinvYl(), form, false); + // 插入主表 + this.save(stIvtIostorinvYl); + + // 调用明细表 插入/更新方法 + iostorinvdtlYlService.create(rows, stIvtIostorinvYl.getIostorinv_id()); + } + + @Override + public String updateBill(JSONObject form) { + Assert.notNull(new Object[]{form, form.get("iostorinv_id")}, "请求参数不能为空"); + StIvtIostorinvYl mst = form.toJavaObject(StIvtIostorinvYl.class); + mst.setUpdate_id(SecurityUtils.getCurrentUserId()); + mst.setUpdate_name(SecurityUtils.getCurrentNickName()); + mst.setUpdate_time(new Date()); + this.updateById(mst); + + JSONArray rows = form.getJSONArray("tableData"); + if (ObjectUtil.isEmpty(rows)) throw new BadRequestException("请求参数不能为空"); + // 调用明细表 插入/更新方法 + iostorinvdtlYlService.create(rows, form.getString("iostorinv_id")); + return mst.getIostorinv_id(); + } + + @Override + public void delete(Long[] ids) { + + for (Long id : ids) { + StIvtIostorinvYl dao = this.getOne(new QueryWrapper().eq("iostorinv_id", id)); + dao.setIs_delete(true); + + this.updateById(dao); + } + } + + @Override + public List getInvDtl(JSONObject form) { + return iostorinvdtlYlService.getDtlList(form); + } + + @Override + public void confirm(JSONObject form) { + + } + + @NotNull + private StIvtIostorinvYl packageMstForm(StIvtIostorinvYl stIvtIostorinvYl, JSONObject whereJson, Boolean isUpdate) { + JSONArray rows = whereJson.getJSONArray("tableData"); + if (!isUpdate) { + // 新增 + stIvtIostorinvYl.setIostorinv_id(IdUtil.getStringId()); + stIvtIostorinvYl.setBill_code(CodeUtil.getNewCode("IO_CODE")); + stIvtIostorinvYl.setIo_type(IOSEnum.IO_TYPE.code("入库")); + stIvtIostorinvYl.setBuss_type(whereJson.getString("bill_type")); + stIvtIostorinvYl.setBill_type(stIvtIostorinvYl.getBuss_type()); + stIvtIostorinvYl.setBill_status(IOSEnum.BILL_STATUS.code("生成")); + stIvtIostorinvYl.setCreate_id(SecurityUtils.getCurrentUserId()); + stIvtIostorinvYl.setCreate_name(SecurityUtils.getCurrentNickName()); + stIvtIostorinvYl.setCreate_time(new Date()); + stIvtIostorinvYl.setIs_delete(false); + stIvtIostorinvYl.setUpdate_id(SecurityUtils.getCurrentUserId()); + stIvtIostorinvYl.setUpdate_name(SecurityUtils.getCurrentNickName()); + stIvtIostorinvYl.setUpdate_time(new Date()); + // TODO 暂时写死 + stIvtIostorinvYl.setSysdeptid("111"); + stIvtIostorinvYl.setSyscompanyid("111"); + } else { + // 修改 + stIvtIostorinvYl.setUpdate_id(SecurityUtils.getCurrentUserId()); + stIvtIostorinvYl.setUpdate_name(SecurityUtils.getCurrentNickName()); + stIvtIostorinvYl.setUpdate_time(new Date()); + } + + stIvtIostorinvYl.setBiz_date(whereJson.getString("biz_date").substring(0, 10)); + // 获取仓库信息 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("stor_id", whereJson.getString("stor_id")); + wrapper.eq("is_used", true); + StIvtBsrealstorattr bsrealDao = stIvtBsrealstorattrService.getOne(wrapper); + if (ObjectUtil.isEmpty(bsrealDao)) throw new BadRequestException("仓库不存在或未启用！"); + + stIvtIostorinvYl.setStor_id(bsrealDao.getStor_id()); + stIvtIostorinvYl.setStor_code(bsrealDao.getStor_code()); + stIvtIostorinvYl.setStor_name(bsrealDao.getStor_name()); + stIvtIostorinvYl.setTotal_qty(whereJson.getBigDecimal("total_qty")); + stIvtIostorinvYl.setDetail_count(rows.size()); + stIvtIostorinvYl.setRemark(whereJson.getString("remark")); + + return stIvtIostorinvYl; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java index 13a6458d..a80cb157 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdisYlServiceImpl.java @@ -1,11 +1,28 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.utils.IdUtil; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.basedata.service.storage.IStIvtSectattrService; +import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr; +import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdisYl; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvdisYlMapper; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 出入库单分配表 服务实现类 @@ -17,4 +34,54 @@ import org.springframework.stereotype.Service; @Service public class StIvtIostorinvdisYlServiceImpl extends ServiceImpl implements IStIvtIostorinvdisYlService { + @Autowired + private IStIvtSectattrService sectattrService; + @Autowired + private IStIvtStructattrService structattrService; + + @Override + public void create(JSONObject jo, JSONObject mst_jo) { + if (ObjectUtil.isNotEmpty(mst_jo)) { + // 先删除在插入 + String mst_id = mst_jo.getString("mst_id"); + String dtl_id = mst_jo.getString("dtl_id"); + String iostorinvdisYl_id = IdUtil.getStringId(); + StIvtIostorinvdisYl row = jo.toJavaObject(StIvtIostorinvdisYl.class); + row.setIostorinv_id(mst_id); + row.setIostorinvdtl_id(dtl_id); + row.setIostorinvdtl_id(dtl_id); + row.setIostorinvdis_id(iostorinvdisYl_id); + List list = this.list(new QueryWrapper().eq("iostorinvdtl_id", dtl_id)); + row.setSeq_no(list.size() + 1); + row.setIs_active(true); + row.setWork_status(IOSEnum.WORK_STATUS.code("未生成")); + row.setPlan_qty(row.getPlan_qty()); + + // 获取库区信息 + QueryWrapper sect_wrapper = new QueryWrapper<>(); + sect_wrapper.eq("sect_id", row.getSect_id()); + sect_wrapper.eq("is_used", true); + StIvtSectattr sectDao = sectattrService.getOne(sect_wrapper); + if (ObjectUtil.isEmpty(sectDao)) throw new BadRequestException("库区不存在或未启用！"); + + row.setSect_code(sectDao.getSect_code()); + row.setSect_name(sectDao.getSect_name()); + // 获取仓位信息 + QueryWrapper struct_wrapper = new QueryWrapper<>(); + struct_wrapper.eq("struct_id", row.getStruct_id()); + struct_wrapper.eq("is_used", true); + StIvtStructattr structDao = structattrService.getOne(struct_wrapper); + if (ObjectUtil.isEmpty(structDao)) throw new BadRequestException("仓位不存在或未启用！"); + + row.setStruct_code(structDao.getStruct_code()); + row.setStruct_name(structDao.getStruct_name()); + row.setPcsn(DateUtil.today()); + this.save(row); + } + } + + @Override + public void deleteById(String mst_id) { + this.remove(new QueryWrapper().eq("iostorinv_id", mst_id)); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdtlYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdtlYlServiceImpl.java index 9f9c189d..15272dbb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdtlYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvdtlYlServiceImpl.java @@ -1,11 +1,26 @@ package org.nl.wms.storage_manage.rawmanage.service.iostorInv.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.utils.IdUtil; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdisYlService; +import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvdtlYl; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.mapper.StIvtIostorinvdtlYlMapper; -import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvdtlYlService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** *

* 出入库单明细表 服务实现类 @@ -17,4 +32,45 @@ import org.springframework.stereotype.Service; @Service public class StIvtIostorinvdtlYlServiceImpl extends ServiceImpl implements IStIvtIostorinvdtlYlService { + @Autowired + private IStIvtIostorinvdisYlService iostorinvdisYlService; + + @Override + public double create(JSONArray rows, String iostorinvYl_id) { + double total_qty = 0; + + if (rows.size() > 0 && StringUtils.isNotEmpty(iostorinvYl_id)) { + // 先删除在插入 + this.remove(new QueryWrapper().eq("iostorinv_id", iostorinvYl_id)); + //删除分配记录 + iostorinvdisYlService.deleteById(iostorinvYl_id); + + for (int i = 0; i < rows.size(); i++) { + String iostorinvdtlYl_id = IdUtil.getStringId(); + StIvtIostorinvdtlYl row = rows.getJSONObject(i).toJavaObject(StIvtIostorinvdtlYl.class); + row.setIostorinv_id(iostorinvYl_id); + row.setIostorinvdtl_id(iostorinvdtlYl_id); + row.setSeq_no(i + 1); + row.setIs_active(true); + row.setPcsn(DateUtil.today()); + row.setBill_status(IOSEnum.BILL_STATUS.code("生成")); + row.setUnassign_qty(row.getPlan_qty()); + this.save(row); + total_qty += row.getPlan_qty().doubleValue(); + JSONObject mst_jo = new JSONObject(); + mst_jo.put("mst_id", iostorinvYl_id); + mst_jo.put("dtl_id", iostorinvdtlYl_id); + iostorinvdisYlService.create(rows.getJSONObject(i), mst_jo); + } + } + return total_qty; + } + + @Override + public List getDtlList(JSONObject form) { + if (ObjectUtil.isEmpty(form) || (StrUtil.isEmpty(form.getString("iostorinv_id")) && StrUtil.isEmpty(form.getString("bill_code")))) { + return new ArrayList<>(); + } + return baseMapper.getIostorinvdtl(form); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java index 71444510..3f4b366d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java @@ -162,6 +162,7 @@ public class StIvtIostorinvBcp implements Serializable { /** * 创建人姓名 */ + private String create_name; /** diff --git a/mes/qd/src/api/wms/basedata/st/structattr.js b/mes/qd/src/api/wms/basedata/st/structattr.js index fbcd30c8..8c874bb6 100644 --- a/mes/qd/src/api/wms/basedata/st/structattr.js +++ b/mes/qd/src/api/wms/basedata/st/structattr.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function add(data) { return request({ - url: 'api/structattr', + url: 'api/stIvtStructattr', method: 'post', data }) @@ -10,7 +10,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/structattr/', + url: 'api/stIvtStructattr/', method: 'delete', data: ids }) @@ -18,7 +18,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/structattr', + url: 'api/stIvtStructattr', method: 'put', data }) @@ -26,10 +26,18 @@ export function edit(data) { export function changeActive(data) { return request({ - url: 'api/structattr/changeActive', + url: 'api/stIvtStructattr/stIvtStructattr', method: 'put', data }) } -export default { add, edit, del, changeActive } +export function getSectCascader(data) { + return request({ + url: '/api/stIvtStructattr/getSectCascader', + method: 'post', + data + }) +} + +export default { add, edit, del, changeActive, getSectCascader } diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue index c261c596..16f02500 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue @@ -26,6 +26,25 @@ + + + + + + + + - + + + + + + - - - @@ -214,6 +236,8 @@ const defaultForm = { detail_count: '0', bill_type: '', remark: '', + workshop_id: '', + stor_id: '', biz_date: new Date(), create_mode: '', tableData: [] diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue index ebb0d335..9876573a 100644 --- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue @@ -12,44 +12,33 @@ > - + - 保存 + 保存 关闭 - + - + - - - - - + + - + + + + + + + + + + + + + + + + + - + @@ -92,12 +127,10 @@ style="width: 210px" /> - - - - + @@ -105,7 +138,7 @@

- + - + - - - - - - - + + + + + + + + + +