From 5fa707dbeb602e1552adde328c308f73e5ccf709 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期四, 27 三月 2025 14:22:49 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 24 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java | 125 ++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java | 8
rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 17 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java | 31 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java | 61 +++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java | 12 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 268 ++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java | 10
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 31 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 46 ++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java | 5
rsf-server/src/main/resources/application.yml | 2
18 files changed, 625 insertions(+), 38 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index 286a6b3..21b8076 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,9 +22,9 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_loc_area_mat";
- generator.tableDesc="loc areas mats";
- generator.packagePath="com.vincent.rsf.server.test";
+ generator.table="man_device_site";
+ generator.tableDesc="device sites";
+ generator.packagePath="com.vincent.rsf.server.manager";
generator.build();
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 0f8d3ec..37fef45 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -147,19 +147,9 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
public R getListByMatnr(@RequestBody Map<String, String> params){
if (Objects.isNull(params)) {
- throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
+ return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
return R.ok(asnOrderService.getListByMatnr(params));
- }
-
- @PostMapping("/asnOrder/generate/barcode")
- @ApiOperation("鐢熸垚ASN鏍囩")
- @PreAuthorize("hasAuthority('manager:asnOrder:list')")
- public R generateBarcode(@RequestBody List<AsnOrder> orders) {
- if (orders.isEmpty()) {
- return R.error("鍗曟嵁涓嶈兘涓虹┖!!");
- }
- return asnOrderService.generateBarcode(orders);
}
@@ -168,8 +158,18 @@
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
public R orderAndItem(@RequestBody AsnOrderAndItemsParams params) {
if (Objects.isNull(params)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return asnOrderService.saveOrderAndItems(params);
}
+
+ @ApiOperation("鍗曟嵁淇℃伅淇敼")
+ @PostMapping("/asnOrder/items/update")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R orderAndrItemUpdate(@RequestBody AsnOrderAndItemsParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderService.updateOrderItem(params);
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index b5be696..c757b02 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -11,6 +11,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -123,14 +124,26 @@
ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
}
+
+ @PostMapping("/asnOrderItem/generate/barcode")
+ @ApiOperation("鐢熸垚ASN鏍囩")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R generateBarcode(@RequestBody List<Long> orders) {
+ if (orders.isEmpty()) {
+ return R.error("鍗曟嵁涓嶈兘涓虹┖!!");
+ }
+ return asnOrderItemService.generateBarcode(orders);
+ }
+
+
/**
* ASN鍗曟嵁鏄庣粏瀵煎叆
* @param file
* @return
*/
- @PostMapping("/asnOrder/import")
+ @PostMapping("/asnOrderItem/import")
@ApiOperation("ASN瀵煎叆鎺ュ彛")
- @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
if (Objects.isNull(file)) {
throw new CoolException("鏂囦欢涓嶈兘涓虹┖锛侊紒");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
new file mode 100644
index 0000000..bc4524a
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
@@ -0,0 +1,125 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.DeviceSiteParame;
+import com.vincent.rsf.server.manager.entity.DeviceSite;
+import com.vincent.rsf.server.manager.service.DeviceSiteService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@RestController
+@Api(tags = "绔欑偣绠＄悊")
+public class DeviceSiteController extends BaseController {
+
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/deviceSite/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<DeviceSite, BaseParam> pageParam = new PageParam<>(baseParam, DeviceSite.class);
+ return R.ok().add(deviceSiteService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/deviceSite/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(deviceSiteService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping({"/deviceSite/many/{ids}", "/deviceSites/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(deviceSiteService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @GetMapping("/deviceSite/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(deviceSiteService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:save')")
+ @OperationLog("Create device sites")
+ @PostMapping("/deviceSite/save")
+ public R save(@RequestBody DeviceSite deviceSite) {
+ deviceSite.setCreateBy(getLoginUserId());
+ deviceSite.setCreateTime(new Date());
+ deviceSite.setUpdateBy(getLoginUserId());
+ deviceSite.setUpdateTime(new Date());
+ if (!deviceSiteService.save(deviceSite)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(deviceSite);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:update')")
+ @OperationLog("Update device sites")
+ @PostMapping("/deviceSite/update")
+ public R update(@RequestBody DeviceSite deviceSite) {
+ deviceSite.setUpdateBy(getLoginUserId());
+ deviceSite.setUpdateTime(new Date());
+ if (!deviceSiteService.updateById(deviceSite)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(deviceSite);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:remove')")
+ @OperationLog("Delete device sites")
+ @PostMapping("/deviceSite/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!deviceSiteService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/deviceSite/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<DeviceSite> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(DeviceSite::getName, condition);
+ }
+ deviceSiteService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+ @PostMapping("/deviceSite/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(deviceSiteService.list(), DeviceSite.class), response);
+ }
+
+ @PreAuthorize("hasAuthority('manager:deviceSite:save')")
+ @ApiOperation("绔欑偣鍒濆鍖�")
+ @PostMapping("/deviceSite/init")
+ public R initDeviceSite(@RequestBody DeviceSiteParame param) {
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(deviceSiteService.initSites(param));
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 0fcbe92..091cf4a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -206,14 +206,14 @@
} else {
matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
}
- ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@ApiOperation("涓嬭浇鐗╂枡妯℃澘")
@PostMapping("/matnr/template/download")
public void download(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class), response);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java
new file mode 100644
index 0000000..0563c68
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java
@@ -0,0 +1,31 @@
+package com.vincent.rsf.server.manager.controller.params;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DeviceSiteParame {
+
+ @ApiModelProperty("鏄惁鍒濆鍖�")
+ private Integer flagInit;
+
+ @ApiModelProperty("璁惧绫诲瀷")
+ private String deviceType;
+
+ @ApiModelProperty("浣滀笟绫诲瀷")
+ private List<Long> typeIds;
+
+ @ApiModelProperty("浣滀笟绔欑偣")
+ private List<String> sites;
+
+ @ApiModelProperty("璁惧缂栧彿")
+ private String deviceCode;
+
+ @ApiModelProperty("璁惧浣滀笟绔欑偣")
+ private List<String> deviceSites;
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
new file mode 100644
index 0000000..d2a1173
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -0,0 +1,268 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.manager.service.LocTypeService;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.entity.DictType;
+import com.vincent.rsf.server.system.service.DictDataService;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.stream.Collectors;
+
+@Data
+@Accessors(chain = true)
+@TableName("man_device_site")
+public class DeviceSite implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍏ュ嚭搴撶被鍨�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ private String type;
+
+ /**
+ * 绔欑偣缂栧彿
+ */
+ @ApiModelProperty(value= "绔欑偣缂栧彿")
+ private String site;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * wcs绔欑偣缂栧彿
+ */
+ @ApiModelProperty(value= "wcs绔欑偣缂栧彿")
+ private String wcsCode;
+
+ /**
+ * 绔欑偣鏍囩
+ */
+ @ApiModelProperty(value= "绔欑偣鏍囩")
+ private String label;
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ @ApiModelProperty(value= "璁惧绫诲瀷")
+ private String device;
+
+ /**
+ * 璁惧缂栧彿
+ */
+ @ApiModelProperty(value= "璁惧缂栧彿")
+ private String deviceCode;
+
+ /**
+ * 璁惧绔欑偣
+ */
+ @ApiModelProperty(value= "璁惧绔欑偣")
+ private String deviceSite;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+
+ /**
+ * 浣滀笟绫诲瀷
+ */
+ @TableField(exist = false)
+ private String typeIds;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public DeviceSite() {}
+
+ public DeviceSite(String type,String site,String name,String wcsCode,String label,String device,String deviceCode,String deviceSite,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.type = type;
+ this.site = site;
+ this.name = name;
+ this.wcsCode = wcsCode;
+ this.label = label;
+ this.device = device;
+ this.deviceCode = deviceCode;
+ this.deviceSite = deviceSite;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// DeviceSite deviceSite = new DeviceSite(
+// null, // 鍏ュ嚭搴撶被鍨�
+// null, // 绔欑偣缂栧彿
+// null, // 鍚嶇О
+// null, // wcs绔欑偣缂栧彿
+// null, // 绔欑偣鏍囩
+// null, // 璁惧绫诲瀷
+// null, // 璁惧缂栧彿
+// null, // 璁惧绔欑偣
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getType$(){
+ if (null == this.type){ return null; }
+ String[] split = this.type.split(",");
+ List<String> asList = Arrays.asList(split);
+ if (asList.isEmpty()) {
+ return null;
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ List<DictData> dictDatas = dictDataService.list(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
+ .in(DictData::getId, asList));
+ if (dictDatas.isEmpty()) {
+ return null;
+ }
+ List<String> strings = dictDatas.stream().map(DictData::getLabel).collect(Collectors.toList());
+
+ return StringUtils.join(strings, ",");
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java
new file mode 100644
index 0000000..9444623
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.DeviceSite;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DeviceSiteMapper extends BaseMapper<DeviceSite> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java
index c926381..7258d1e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java
@@ -1,8 +1,12 @@
package com.vincent.rsf.server.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
+import java.util.List;
+
public interface AsnOrderItemLogService extends IService<AsnOrderItemLog> {
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
index 905a2e2..0cb3f60 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
@@ -6,17 +6,22 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
public interface AsnOrderItemService extends IService<AsnOrderItem> {
+
R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception;
boolean fieldsSave(Map<String, Object> params);
+ R generateBarcode(List<Long> orders);
+
IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
index 5f9e5c8..48a58aa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -12,9 +12,9 @@
boolean notifyInspect(List<AsnOrder> orders);
- R generateBarcode(List<AsnOrder> orders);
-
List<AsnOrder> getListByMatnr(Map<String, String> params);
R saveOrderAndItems(AsnOrderAndItemsParams params);
+
+ R updateOrderItem(AsnOrderAndItemsParams params);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java
new file mode 100644
index 0000000..5bb3ef3
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java
@@ -0,0 +1,10 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.controller.params.DeviceSiteParame;
+import com.vincent.rsf.server.manager.entity.DeviceSite;
+
+public interface DeviceSiteService extends IService<DeviceSite> {
+
+ boolean initSites(DeviceSiteParame param);
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index c9e55fa..99cb110 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
+import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -16,11 +18,16 @@
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
+import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vincent.rsf.server.manager.service.PurchaseService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.ExtendFieldsUtils;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,6 +36,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.stream.Collectors;
@Service("asnOrderItemService")
public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, AsnOrderItem> implements AsnOrderItemService {
@@ -43,6 +51,29 @@
private FieldsItemService fieldsItemService;
@Override
+ public R generateBarcode(List<Long> orders) {
+ if (Objects.isNull(orders) || orders.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ List<AsnOrderItem> items = this.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, orders));
+ if (items.isEmpty()) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ items.forEach(item -> {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("绯荤粺閿欒锛岃妫�鏌ャ�孲YS_LABEL_CODE銆嶆爣绛捐鍒欐槸鍚﹀瓨鍦�");
+ }
+ item.setTrackCode(ruleCode);
+ });
+ if (!this.saveOrUpdateBatch(items)) {
+ throw new CoolException("鐢熸垚鏉＄爜澶辫触锛侊紒");
+ }
+
+ return R.ok();
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception {
ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 098d817..27e33ef 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -21,6 +22,7 @@
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -66,22 +68,6 @@
}
}
- @Override
- public R generateBarcode(List<AsnOrder> orders) {
- orders.forEach(order -> {
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- if (!items.isEmpty()) {
- items.forEach(item -> {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
- item.setTrackCode(ruleCode);
- });
- if (!asnOrderItemService.saveOrUpdateBatch(items)) {
- throw new CoolException("鐢熸垚鏉＄爜澶辫触锛侊紒");
- }
- }
- });
- return R.ok();
- }
@Override
public List<AsnOrder> getListByMatnr(Map<String, String> params) {
@@ -130,4 +116,32 @@
});
return R.ok("淇濆瓨鎴愬姛!!");
}
+
+ /**
+ * 琛ㄥ崟鏄庣粏淇敼
+ * @param params
+ * @return
+ */
+ @Override
+ @Transactional
+ public R updateOrderItem(AsnOrderAndItemsParams params) {
+ if (Objects.isNull(params.getOrders())) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrders().getId())) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
+ }
+ if (this.updateById(params.getOrders())) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+ if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
+ return R.ok("淇敼瀹屾垚锛侊紒");
+ }
+ List<Map<String, Object>> items = params.getItems();
+ List<AsnOrderItem> asnOrderItems = JSONArray.parseArray(JSONArray.toJSONString(items), AsnOrderItem.class);
+ if (asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
+ throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ return R.ok("淇敼瀹屾垚锛侊紒");
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
new file mode 100644
index 0000000..9328ef1
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
@@ -0,0 +1,61 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.controller.params.DeviceSiteParame;
+import com.vincent.rsf.server.manager.mapper.DeviceSiteMapper;
+import com.vincent.rsf.server.manager.entity.DeviceSite;
+import com.vincent.rsf.server.manager.service.DeviceSiteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+@Service("deviceSiteService")
+public class DeviceSiteServiceImpl extends ServiceImpl<DeviceSiteMapper, DeviceSite> implements DeviceSiteService {
+
+ /**
+ * 鍒濆鍖栫珯鐐�
+ * @param param
+ * @return
+ */
+ @Override
+ public boolean initSites(DeviceSiteParame param) {
+ if (param.getFlagInit() == 1) {
+ if (!this.remove(new LambdaQueryWrapper<>())) {
+ throw new CoolException("鍒濆鍖栧け璐ワ細 鍒犻櫎绔欑偣澶辫触锛侊紒");
+ }
+ }
+ if (Objects.isNull(param.getDeviceSites()) || param.getDeviceSites().isEmpty()) {
+ throw new CoolException("鍒濆鍖栧け璐ワ細 璁惧浣滀笟绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.getSites()) || param.getSites().isEmpty()) {
+ throw new CoolException("鍒濆鍖栧け璐�: 浣滀笟绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.getTypeIds()) || param.getTypeIds().isEmpty()) {
+ throw new CoolException("鍒濆鍖栧け璐ワ細 浣滀笟绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ List<DeviceSite> deviceSites = new ArrayList<>();
+ for (String site : param.getSites()) {
+ for (String deviceSite : param.getDeviceSites()) {
+ for (Long id : param.getTypeIds()) {
+ DeviceSite site1 = new DeviceSite();
+ site1.setType(id + "")
+ .setSite(site)
+ .setDevice(param.getDeviceType())
+ .setDeviceSite(deviceSite)
+ .setDeviceCode(param.getDeviceCode());
+ deviceSites.add(site1);
+ }
+ }
+ }
+ if (!this.saveBatch(deviceSites)) {
+ throw new CoolException("鍒濆鍖栧け璐ワ細 鏁版嵁淇濆瓨澶辫触锛侊紒");
+ }
+ return true;
+ }
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
index 5791882..00a24a1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
@@ -9,6 +9,14 @@
*/
public class DictTypeCode {
+ /**
+ * 浼佷笟绫诲瀷
+ */
public final static String DICT_COMPANY_TYPE = "sys_companys_type";
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ public final static String DICT_SYS_TASK_TYPE = "sys_task_type";
+
}
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index 4a03079..a844729 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -23,7 +23,7 @@
# global-config:
# field-strategy: 0
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
diff --git a/rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.xml b/rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.xml
new file mode 100644
index 0000000..d6ed72e
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.xml
@@ -0,0 +1,5 @@
+<?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="com.vincent.rsf.server.manager.mapper.DeviceSiteMapper">
+
+</mapper>
--
Gitblit v1.9.1