diff --git a/wms/hd/nladmin-system/pom.xml b/wms/hd/nladmin-system/pom.xml index 8a6e1a9..03a4863 100644 --- a/wms/hd/nladmin-system/pom.xml +++ b/wms/hd/nladmin-system/pom.xml @@ -1,10 +1,10 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - llsh_wms org.nl + jl_wms 1.0-SNAPSHOT 4.0.0 @@ -31,18 +31,6 @@ mongo-java-driver 3.4.2 - org.reflections reflections diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java index aba8ea4..b4828e3 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java @@ -87,6 +87,21 @@ public class MaterialDto implements Serializable { */ private String is_delete; + /** + * 是否人工打包 + */ + private String is_manmade; + + /** + * 码垛数量 + */ + private Long palletize_num; + + /** + * 托盘类型 + */ + private String vehicle_type; + /** * 外部标识 */ diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java index bf22656..03a17c1 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java @@ -44,10 +44,10 @@ public class MaterialServiceImpl implements MaterialService { String sql = "1=1"; if (StrUtil.isNotEmpty(name)) { sql = " (material_code like '%"+name+"%' OR material_code like '%"+name+"%')"; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), sql+ " and is_delete='0'", "update_time desc"); + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), sql + " and is_delete='0'", "update_time desc"); final JSONObject json = rb.pageResult(); + log.info("json:{}",json); return json; } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java index 1d87ec0..2a10e90 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java @@ -2,7 +2,11 @@ package org.nl.wms.sch.rest; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONArray; +import com.mysql.cj.xdevapi.JsonArray; +import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; import org.springframework.data.domain.Pageable; @@ -13,6 +17,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; + +import java.util.Iterator; import java.util.Map; import lombok.extern.slf4j.Slf4j; @@ -88,4 +94,12 @@ public class PointController { return new ResponseEntity<>(pointService.getEndPoint(whereJson,page),HttpStatus.OK); } + @PostMapping("/getPointStatu") + @Log("获取点位状态") + @ApiOperation("获取点位状态") + public ResponseEntity getPointStatu(@RequestBody JSONArray ja) { + pointService.getPointStatuAndChage(ja); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java index df9b5a4..5c7cbe7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java @@ -1,6 +1,7 @@ package org.nl.wms.sch.service; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.wms.sch.service.dto.PointDto; import org.springframework.data.domain.Pageable; @@ -79,4 +80,6 @@ public interface PointService { * 获取终点点位 */ Map getEndPoint(Map whereJson, Pageable page); + + void getPointStatuAndChage(JSONArray ja); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 611ef5a..6b56c6a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -7,14 +7,18 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import org.nl.exception.BadRequestException; +import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; import org.nl.wql.WQL; +import org.nl.wql.core.bean.ResultBean; +import org.nl.wql.core.bean.WQLData; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Pageable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -252,4 +256,26 @@ public class PointServiceImpl implements PointService { return json; } + @Override + public void getPointStatuAndChage(JSONArray ja) { + //发起请求获取数据 + try { + JSONObject jsona = AcsUtil.notifyAcs("/api/wms/getPointStatus", ja); + JSONArray arr = jsona.getJSONArray("key"); + WQLObject wql = WQLObject.getWQLObject("sch_base_point"); + for (int i = 0; i < arr.size(); i++) { + JSONObject jsonObject = ja.getJSONObject(i); + Long point_id = (Long) jsonObject.get("point_id"); + String point_status = (String) jsonObject.get("point_status"); + //获得单条数据 + JSONObject jo = wql.query("point_id='" + point_id + "'").uniqueResult(0); + jo.put("point_status",point_status); + //获取数据表,更新状态 + wql.update(jo); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index b66fca6..5ad0ebe 100644 Binary files a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls differ diff --git a/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java b/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java index d61e0c0..d239cd8 100644 --- a/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java +++ b/wms/hd/nladmin-system/src/test/java/org/nl/Test3.java @@ -140,8 +140,8 @@ public class Test3 extends BaseTest { iodObject.put("col_num", structObject.getString("col")); iodObject.put("layer_num", structObject.getString("layer")); iodObject.put("height", 10); - iodObject.put("out_seq_no", i*10); - iodObject.put("in_seq_no", i*10); + iodObject.put("out_seq_no", i * 10); + iodObject.put("in_seq_no", i * 10); iodObject.put("load_series", 1); iodObject.put("create_id", 1); iodObject.put("create_name", "管理员"); @@ -241,26 +241,189 @@ public class Test3 extends BaseTest { } + //初始化入窑缓存货架 @Test public void syncStruct4() { - JSONArray structArray = WQLObject.getWQLObject("st_ivt_structattr").query("is_delete='0'").getResultJSONArray(0); - WQLObject wo = WQLObject.getWQLObject("st_ivt_structrelavehicletype"); - String now = DateUtil.now(); - for (int i = 0; i < structArray.size(); i++) { - for (int j = 1; j <= 3; j++) { - JSONObject jsonObject = structArray.getJSONObject(i); - JSONObject map = new JSONObject(); - map.put("relation_id", String.valueOf(IdUtil.getSnowflake(1, 1).nextId())); - map.put("struct_id", jsonObject.getString("struct_id")); - map.put("vehicle_type", "0" + j); - map.put("create_id", 1); - map.put("create_name", "管理员"); - map.put("create_time", now); - map.put("update_optid", 1); - map.put("update_optname", "管理员"); - map.put("update_time", now); - wo.insert(map); + WQLObject structTable = WQLObject.getWQLObject("st_ivt_structattr"); + for (int i = 1; i < 4; i++) { + for (int j = 1; j < 7; j++) { + for (int k = 1; k < 3; k++) { + String struct_id = IdUtil.getSnowflake(1, 1).nextIdStr(); + String struct_code = "L" + i + "-" + j + "-" + k; + String struct_name = 1 + "排" + j + "列" + k + "层"; + String simple_name = struct_name; + String sect_id = "1518109502010953728"; + String stor_id = "1518109007364100096"; + String row_seq = i + ""; + String col = j + ""; + String layer = j + ""; + String is_used = "1"; + String is_delete = "0"; + String create_id = "1"; + String create_name = "qinx"; + String create_time = DateUtil.now(); + JSONObject jo = new JSONObject(); + jo.put("struct_id", struct_id); + jo.put("struct_code", struct_code); + jo.put("struct_name", struct_name); + jo.put("simple_name", simple_name); + jo.put("sect_id", sect_id); + jo.put("stor_id", stor_id); + jo.put("row_seq", row_seq); + jo.put("col", col); + jo.put("layer", layer); + jo.put("is_used", is_used); + jo.put("is_delete", is_delete); + jo.put("create_id", create_id); + jo.put("create_name", create_name); + jo.put("create_time", create_time); + structTable.insert(jo); + } } + } } + + //初始化成品货架 + @Test + public void syncStruct5() { + WQLObject structTable = WQLObject.getWQLObject("st_ivt_structattr"); + for (int i = 4; i < 5; i++) { + for (int j = 1; j < 19; j++) { + for (int k = 1; k < 3; k++) { + String struct_id = IdUtil.getSnowflake(1, 1).nextIdStr(); + String struct_code = "L" + i + "-" + j + "-" + k; + String struct_name = i + "排" + j + "列" + k + "层"; + String simple_name = struct_name; + String sect_id = "1518109805401739264"; + String stor_id = "1518109007364100096"; + String row_seq = i + ""; + String col = j + ""; + String layer = j + ""; + String is_used = "1"; + String is_delete = "0"; + String create_id = "1"; + String create_name = "qinx"; + String create_time = DateUtil.now(); + JSONObject jo = new JSONObject(); + jo.put("struct_id", struct_id); + jo.put("struct_code", struct_code); + jo.put("struct_name", struct_name); + jo.put("simple_name", simple_name); + jo.put("sect_id", sect_id); + jo.put("stor_id", stor_id); + jo.put("row_seq", row_seq); + jo.put("col", col); + jo.put("layer", layer); + jo.put("is_used", is_used); + jo.put("is_delete", is_delete); + jo.put("create_id", create_id); + jo.put("create_name", create_name); + jo.put("create_time", create_time); + structTable.insert(jo); + } + } + + } + } + + //初始化分配规则 + @Test + public void syncStruct6() { + WQLObject structTable = WQLObject.getWQLObject("st_ivt_structattr"); + WQLObject ruleTable = WQLObject.getWQLObject("st_rule_iodisstruct"); + JSONArray arr = structTable.query("1=1").getResultJSONArray(0); + for (int i = 0; i < arr.size(); i++) { + JSONObject jo = arr.getJSONObject(i); + String disrule_uuid = IdUtil.getSnowflake(1, 1).nextIdStr(); + String disrule_type = "00"; + String struct_uuid = jo.getString("struct_id"); + String struct_code = jo.getString("struct_code"); + String struct_name = jo.getString("struct_name"); + String sect_uuid = jo.getString("sect_id"); + String store_uuid = jo.getString("store_id"); + String row_num = jo.getString("row_seq"); + String col_num = jo.getString("col"); + String layer_num = jo.getString("layer"); + String height = "10"; + String out_seq_no = i * 10 + ""; + String in_seq_no = i * 10 + ""; + String load_series = "10"; + String create_time = DateUtil.now(); + String create_name = "qinx"; + String create_id = "1"; + JSONObject joObj = new JSONObject(); + joObj.put("create_id", create_id); + joObj.put("create_name", create_name); + joObj.put("create_time", create_time); + joObj.put("load_series", load_series); + joObj.put("in_seq_no", in_seq_no); + joObj.put("out_seq_no", out_seq_no); + joObj.put("height", height); + joObj.put("layer_num", layer_num); + joObj.put("sect_uuid", sect_uuid); + joObj.put("col_num", col_num); + joObj.put("row_num", row_num); + joObj.put("store_uuid", store_uuid); + joObj.put("struct_name", struct_name); + joObj.put("struct_code", struct_code); + joObj.put("struct_uuid", struct_uuid); + joObj.put("disrule_type", disrule_type); + joObj.put("disrule_uuid", disrule_uuid); + ruleTable.insert(joObj); + } + } + + //初始化仓位载具 + @Test + public void syncStruct7() { + WQLObject structTable = WQLObject.getWQLObject("st_ivt_structattr"); + WQLObject ruleTable = WQLObject.getWQLObject("st_ivt_structrelavehicletype"); + JSONArray arr = structTable.query("1=1").getResultJSONArray(0); + for (int i = 0; i < arr.size(); i++) { + JSONObject jo = arr.getJSONObject(i); + String relation_id = IdUtil.getSnowflake(1, 1).nextIdStr(); + String struct_id = jo.getString("struct_id"); + String vehicle_type = "02"; + String create_time = DateUtil.now(); + String create_name = "qinx"; + String create_id = "1"; + JSONObject joObj = new JSONObject(); + joObj.put("relation_id", relation_id); + joObj.put("struct_id", struct_id); + joObj.put("vehicle_type", vehicle_type); + joObj.put("create_time", create_time); + joObj.put("create_name", create_name); + joObj.put("create_id", create_id); + ruleTable.insert(joObj); + } + } + + + //初始化仓位载具 + @Test + public void syncStruct8() { + WQLObject structTable = WQLObject.getWQLObject("st_ivt_structattr"); + WQLObject ruleTable = WQLObject.getWQLObject("st_ivt_structrelamaterial"); + JSONArray arr = structTable.query("1=1").getResultJSONArray(0); + for (int i = 0; i < arr.size(); i++) { + JSONObject jo = arr.getJSONObject(i); + String relation_id = IdUtil.getSnowflake(1, 1).nextIdStr(); + String struct_id = jo.getString("struct_id"); + String material_id = "1515940603542769664"; + String create_time = DateUtil.now(); + String create_name = "qinx"; + String create_id = "1"; + JSONObject joObj = new JSONObject(); + joObj.put("relation_id", relation_id); + joObj.put("struct_id", struct_id); + joObj.put("material_id", material_id); + joObj.put("create_time", create_time); + joObj.put("create_name", create_name); + joObj.put("create_id", create_id); + ruleTable.insert(joObj); + } + } + + } diff --git a/wms/hd/nladmin-system/src/test/java/org/nl/mongodb/Test232.java b/wms/hd/nladmin-system/src/test/java/org/nl/mongodb/Test232.java new file mode 100644 index 0000000..dda19a7 --- /dev/null +++ b/wms/hd/nladmin-system/src/test/java/org/nl/mongodb/Test232.java @@ -0,0 +1,27 @@ +package org.nl.mongodb; + +import java.util.Scanner; + +class Tx { + static int[] arr = {100,50,20,5,1}; //用来存纸币面额 + static int[] num = new int[5]; //每种纸币的数量 + public static void main(String[] args) { + + Scanner sc = new Scanner(System.in); + int n = sc.nextInt(); + + f(n); + + for (int i = 0; i < arr.length; i++) { + System.out.println(arr[i]+":"+num[i]); + } + } + static void f(int n) { + //遍历arr数组 + for (int i = 0; i < arr.length; i++) { + // 求出每类纸币需要多少张 + num[i] = n / arr[i]; + n = n % arr[i]; + } + } +} \ No newline at end of file diff --git a/wms/hd/nladmin-test/pom.xml b/wms/hd/nladmin-test/pom.xml deleted file mode 100644 index 4bd9ee0..0000000 --- a/wms/hd/nladmin-test/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - llsh_wms - org.nl - 1.0-SNAPSHOT - - 4.0.0 - 2.6 - - nladmin-test - - - - - org.nl - nladmin-system - 2.6 - compile - - - - - org.springframework.boot - spring-boot-autoconfigure - 2.0.0.RELEASE - - - org.springframework.boot - spring-boot-configuration-processor - 2.0.0.RELEASE - true - - - - - diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/Cat.java b/wms/hd/nladmin-test/src/main/java/org/nl/Cat.java deleted file mode 100644 index 8ef8808..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/Cat.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.nl; - -public class Cat implements IShout { - @Override - public void shout() { - System.out.println("miao miao111"); - } -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/Dog.java b/wms/hd/nladmin-test/src/main/java/org/nl/Dog.java deleted file mode 100644 index be93aba..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/Dog.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.nl; - -public class Dog implements IShout { - @Override - public void shout() { - System.out.println("wang wang"); - } -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/IShout.java b/wms/hd/nladmin-test/src/main/java/org/nl/IShout.java deleted file mode 100644 index ba49fd4..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/IShout.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.nl; - -public interface IShout { - void shout(); -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/Test111.java b/wms/hd/nladmin-test/src/main/java/org/nl/Test111.java deleted file mode 100644 index a2533da..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/Test111.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.nl; - -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ServiceLoader; - -@RestController -@RequiredArgsConstructor -@Api(tags = "运维:应用管理") -@RequestMapping("/api/test") -public class Test111 { - public static void main(String[] args) { - ServiceLoader shouts = ServiceLoader.load(IShout.class); - for (IShout s : shouts) { - s.shout(); - } - } - @GetMapping(value = "/test") - public String getStr() { - return "hello"; - } - -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianProperties.java b/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianProperties.java deleted file mode 100644 index 1e01819..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianProperties.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.nl.starter; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "spring.tian") -@Data -public class TianProperties { - private String name; - private int age; - private String sex = "M"; -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianService.java b/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianService.java deleted file mode 100644 index 19db779..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianService.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nl.starter; - -public class TianService { - private TianProperties properties; - public TianService() { - } - public TianService(TianProperties userProperties) { - this.properties = userProperties; - } - public void sayHello(){ - System.out.println("hi, 我叫: " + properties.getName() + - ", 今年" + properties.getAge() + "岁" - + ", 性别: " + properties.getSex()); - } -} diff --git a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianServiceAutoConfiguration.java b/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianServiceAutoConfiguration.java deleted file mode 100644 index 1d84981..0000000 --- a/wms/hd/nladmin-test/src/main/java/org/nl/starter/TianServiceAutoConfiguration.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.nl.starter; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableConfigurationProperties(TianProperties.class) -@ConditionalOnClass(TianService.class) -@ConditionalOnProperty(prefix = "spring.tian", value = "enabled", matchIfMissing = true) -public class TianServiceAutoConfiguration { - @Autowired - private TianProperties properties; - @Bean - @ConditionalOnMissingBean(TianService.class) - public TianService tianService() { - return new TianService(properties); - } -} diff --git a/wms/hd/nladmin-test/src/main/resources/META-INF/services/org.nl.IShout b/wms/hd/nladmin-test/src/main/resources/META-INF/services/org.nl.IShout deleted file mode 100644 index 9c82046..0000000 --- a/wms/hd/nladmin-test/src/main/resources/META-INF/services/org.nl.IShout +++ /dev/null @@ -1,2 +0,0 @@ -org.nl.Cat -org.nl.Dog diff --git a/wms/hd/nladmin-test/src/main/resources/META-INF/services/spring.factories b/wms/hd/nladmin-test/src/main/resources/META-INF/services/spring.factories deleted file mode 100644 index 8b0aee2..0000000 --- a/wms/hd/nladmin-test/src/main/resources/META-INF/services/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.nl.starter.TianServiceAutoConfiguration - diff --git a/wms/hd/pom.xml b/wms/hd/pom.xml index bb048b5..dafa2c5 100644 --- a/wms/hd/pom.xml +++ b/wms/hd/pom.xml @@ -6,8 +6,8 @@ org.nl jl_wms - pom 1.0-SNAPSHOT + pom 开发平台 nladmin @@ -17,7 +17,6 @@ nladmin-system - nladmin-test diff --git a/wms/qd/src/api/wms/sch/point.js b/wms/qd/src/api/wms/sch/point.js index 929de14..e198670 100644 --- a/wms/qd/src/api/wms/sch/point.js +++ b/wms/qd/src/api/wms/sch/point.js @@ -39,4 +39,12 @@ export function syncStruct() { }) } -export default { add, edit, del, changeActive, syncStruct } +export function getPointStatu(data) { + return request({ + url: 'api/point/getPointStatu', + method: 'post', + data + }) +} + +export default { add, edit, del, changeActive, syncStruct, getPointStatu } diff --git a/wms/qd/src/views/wms/database/material/index.vue b/wms/qd/src/views/wms/database/material/index.vue index 7d33117..11a1b2c 100644 --- a/wms/qd/src/views/wms/database/material/index.vue +++ b/wms/qd/src/views/wms/database/material/index.vue @@ -11,8 +11,8 @@ - - + + @@ -36,6 +36,29 @@ {{ item.label }} + + {{ item.label }} + + + + + + + + + @@ -73,6 +96,24 @@ /> + + + + + + + + +