入库预约

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierInfoRest.java

@@ -83,7 +83,11 @@ public class SupplierInfoRest {
     public ResultBean<SupplierInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		return baseSupplierInfoService.fetchDetailsVoBySid(sid);
 	}
-
+	@ApiOperation("根据SID获取一条记录")
+	@GetMapping("/fetchDetailsByBillSid/{sid}")
+	public ResultBean<SupplierInfoDetailsVo> fetchDetailsByBillSid(@PathVariable("sid") String sid){
+		return baseSupplierInfoService.fetchDetailsByBillSid(sid);
+	}
 	@ApiOperation("选择供应商")
 	@GetMapping("/choiceSupplierInfo")
 	public ResultBean<List<SupplierInfoChoice>> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillDetailsRest.java

@@ -10,6 +10,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2024/6/6 15:04
@@ -24,7 +26,7 @@ public class WarehouseAnsBillDetailsRest {
 
     @ApiOperation("根据sid查询详情")
     @GetMapping("/selectByBillSid/{sid}")
-    public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid){
+    public ResultBean<List<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid){
         return warehouseAnsBillDetailService.selectByBillSid(sid);
     }
 }

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java

@@ -59,4 +59,14 @@ public class WarehouseAnsBillRest {
     public void exportExcel(@RequestBody WarehouseAnsBillQuery query) {
         warehouseAnsBillService.listExcel(query);
     }
+    @PostMapping("/updateRack")
+    @ApiOperation("修改库区")
+    public ResultBean updateRack(@RequestBody WarehouseAnsBillDto dto) {
+        return warehouseAnsBillService.updateRack(dto);
+    }
+    @PostMapping("/updateRemarks")
+    @ApiOperation("修改单据备注")
+    public ResultBean updateRemarks(@RequestBody WarehouseAnsBillDto dto) {
+        return warehouseAnsBillService.updateRemarks(dto);
+    }
 }

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseRackRest.java

@@ -3,6 +3,7 @@ package com.yxt.wms.apiadmin.aggregation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehousearea.WarehouseAreaVo;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackDto;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackQuery;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackService;
@@ -68,4 +69,9 @@ public class WarehouseRackRest {
     public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
         return wmsWarehouseRackService.updateIsEnable(sid,isEnable);
     }
+    @ApiOperation("根据仓库sid查询所有库位")
+    @GetMapping("/selectAll")
+    public ResultBean<List<WarehouseRackVo>> selectAll(@RequestParam("ckSid") String ckSid){
+        return wmsWarehouseRackService.selectAll(ckSid);
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java

@@ -32,8 +32,10 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeQuery;
 import com.yxt.wms.biz.func.commonmethod.CommonMethod;
 import com.yxt.wms.biz.func.commonmethod.DataRule;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
 import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign;
 import com.yxt.wms.feign.supplier.supplierinfo.SupplierInfoFeign;
+import com.yxt.wms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -65,6 +67,8 @@ public class SupplierInfoService extends MybatisBaseService<SupplierInfoMapper,
 	SupplierInfoFeign baseSupplierInfoFeign;
 	@Autowired
 	CommonMethod commonMethod;
+	@Autowired
+	WarehouseAnsBillFeign warehouseAnsBillFeign;
 	public ResultBean<PagerVo<SupplierInfoVo>> listPageVo(PagerQuery<SupplierInfoQuery> pq) {
 		SupplierInfoQuery query = pq.getParams();
 		DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
@@ -80,6 +84,10 @@ public class SupplierInfoService extends MybatisBaseService<SupplierInfoMapper,
 	public ResultBean<SupplierInfoDetailsVo> fetchDetailsVoBySid(String sid){
 		return baseSupplierInfoFeign.fetchDetailsBySid(sid);
 	}
+	public ResultBean<SupplierInfoDetailsVo> fetchDetailsByBillSid(String sid){
+		WarehouseAnsDetailsVo warehouseAnsDetailsVo=warehouseAnsBillFeign.details(sid).getData();
+		return baseSupplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid());
+	}
 
 	public void delAll(String[] sids) {
 		baseSupplierInfoFeign.delBySids(sids);

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java

@@ -57,4 +57,8 @@ public class WarehouseAnsBill extends BaseEntity {
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillDto.java

@@ -63,6 +63,13 @@ public class WarehouseAnsBillDto {
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
-
+    private String userSid;
+    private String rackSid;
+    private String remarks;
+    private String userName;
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
     private List<WarehouseAnsBillDetailDto> wmsAnsBillDetailList = new ArrayList<>();
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java

@@ -30,6 +30,8 @@ public class WarehouseAnsBillQuery implements Query {
     private String supplierName;
     @ApiModelProperty("运单号")
     private String waybillNumber;
+    @ApiModelProperty("承运商")
+    private String carrier;
     @ApiModelProperty("库区sid")
     private String warehouseRackSid;
 

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java

@@ -10,13 +10,19 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.func.commonmethod.CommonMethod;
 import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.supplierinfo.SupplierInfoDetailsVo;
+import com.yxt.wms.biz.func.sysstaffinfo.SysStaffinfoDetailsVo;
 import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsListDetailsVo;
+import com.yxt.wms.feign.portal.sysstaffinfo.SysStaffinfoFeign;
+import com.yxt.wms.feign.portal.sysuser.SysUser;
+import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.wms.feign.portal.sysuser.SysUserVo;
 import com.yxt.wms.feign.supplier.supplierinfo.SupplierInfoFeign;
 import com.yxt.wms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -33,6 +39,10 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
     SupplierInfoFeign supplierInfoFeign;
     @Autowired
     private CommonMethod commonMethod;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysStaffinfoFeign sysStaffinfoFeign;
 
     public ResultBean<String> saveOrUpdateBill(WarehouseAnsBillDto dto) {
         return wmsAnsBillFeign.saveOrUpdate(dto);
@@ -54,4 +64,14 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
     public void listExcel(WarehouseAnsBillQuery query) {
         wmsAnsBillFeign.exportExcel(query);
     }
+    public ResultBean<List<WarehouseAnsBillExcelVo>> updateRack(WarehouseAnsBillDto dto) {
+        SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid()).getData();
+        dto.setUserName(sysStaffinfoDetailsVo.getName());
+        return wmsAnsBillFeign.updateRack(dto);
+    }
+    public ResultBean<List<WarehouseAnsBillExcelVo>> updateRemarks(WarehouseAnsBillDto dto) {
+        SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid()).getData();
+        dto.setUserName(sysStaffinfoDetailsVo.getName());
+        return wmsAnsBillFeign.updateRemarks(dto);
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java

@@ -24,22 +24,24 @@ public class WarehouseAnsBillVo {
     @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
     private String busTypeKey;
     @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
-    private String busTypeValue;
+    private String busTypeKeyValue;
     @ApiModelProperty("交接状态")
     private String handoverStatus;
+    private String handoverStatusValue;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("交接时间")
     private Date handoverTime;
     @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
     private Integer billState;
+    private String billStateValue;
     @ApiModelProperty("仓库sid")
     private String warehouseSid;
     @ApiModelProperty("仓库名")
     private String warehouseName;
     @ApiModelProperty("库区sid")
-    private String warehouseAreaSid;
+    private String warehouseRackSid;
     @ApiModelProperty("库区名")
-    private String warehouseAreaName;
+    private String warehouseRackName;
     @ApiModelProperty("申请人")
     private String applicant;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -60,6 +62,10 @@ public class WarehouseAnsBillVo {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     private String remarks;
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
 
 
 

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsDetailsVo.java

@@ -59,7 +59,10 @@ public class WarehouseAnsDetailsVo {
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
-
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
 
     private List<WarehouseAnsListDetailsVo> list = new ArrayList<>();
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailService.java

@@ -28,7 +28,7 @@ public class WarehouseAnsBillDetailService extends MybatisBaseService<WarehouseA
 
 
 
-    public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(String sid) {
+    public ResultBean<List<WarehouseAnsBillDetailVo>> selectByBillSid(String sid) {
         return warehouseAnsBillDetailFeign.selectByBillSid(sid);
     }
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java

@@ -17,9 +17,12 @@ import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
 import com.yxt.wms.feign.warehouse.wmswarehouserack.WarehouseRackFeign;
 import com.yxt.wms.utils.OrgPathQuery;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Arrays;
 import java.util.List;
@@ -100,4 +103,8 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
     public ResultBean updateIsEnable(String sid,String isEnable) {
         return warehouseRackFeign.updateIsEnable(sid, isEnable);
     }
+
+    public ResultBean<List<WarehouseRackVo>> selectAll(String ckSid){
+        return warehouseRackFeign.selectAll(ckSid);
+    }
 }

wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUser.java

@@ -0,0 +1,73 @@
+package com.yxt.wms.feign.portal.sysuser;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUser.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUser <br/>
+ * Description: 用户表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表", description = "用户表")
+@TableName("sys_user")
+@Data
+public class SysUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("登录名，登录名不能相同")
+    private String userName;
+    
+	@ApiModelProperty("密码（加密或签名后）")
+    private String password;
+    
+	@ApiModelProperty("密码修改时限")
+    private String pwdDayslimit;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后一次密码修改时间")
+    private Date pwdModifyTime;
+    
+	@ApiModelProperty("在线状态（0为离线、1为在线）")
+    private Integer onlineState;
+    
+	@ApiModelProperty("用户登录时随机生成身份验证字符串")
+    private String token;
+    
+	@ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+    private String isAdmin;
+    
+	@ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+    private String appId;
+    
+	@ApiModelProperty("关联的人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("手机号")
+    private String mobile;
+    
+	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private Integer userType;
+
+	@ApiModelProperty("用户头像")
+    private String headImage;
+    @TableField(exist = false)
+    private String orgSid;
+    private String accountType;////账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户‘
+
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java

@@ -48,4 +48,11 @@ public interface WarehouseAnsBillFeign {
     @PostMapping("/exportExcel")
     @ApiOperation(value = "导出")
     public void exportExcel(@RequestBody WarehouseAnsBillQuery query);
+
+    @PostMapping("/updateRack")
+    @ApiOperation("修改库区")
+    public ResultBean updateRack(@RequestBody WarehouseAnsBillDto dto);
+    @PostMapping("/updateRemarks")
+    @ApiOperation("修改单据备注")
+    public ResultBean updateRemarks(@RequestBody WarehouseAnsBillDto dto);
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java

@@ -54,4 +54,14 @@ public class WarehouseAnsBillFeignFallback implements WarehouseAnsBillFeign {
 	public void exportExcel(WarehouseAnsBillQuery query) {
 
 	}
+
+	@Override
+	public ResultBean updateRack(WarehouseAnsBillDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateRemarks(WarehouseAnsBillDto dto) {
+		return null;
+	}
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbilldetail/WarehouseAnsBillDetailFeign.java

@@ -13,6 +13,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Api(tags = "预期到货通知单")
 @FeignClient(
         contextId = "ss-common-warehouse-WmsAnsBillDetail",
@@ -27,5 +29,5 @@ public interface WarehouseAnsBillDetailFeign {
 
     @ApiOperation("根据sid查询详情")
     @PostMapping("/selectByBillSid/{sid}")
-    public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid);
+    public ResultBean<List<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid);
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbilldetail/WarehouseAnsBillDetailFeignFallback.java

@@ -10,6 +10,8 @@ import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
 import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysRoleFeignFallback.java <br/>
@@ -33,7 +35,7 @@ public class WarehouseAnsBillDetailFeignFallback implements WarehouseAnsBillDeta
 	}
 
 	@Override
-	public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(String sid) {
+	public ResultBean<List<WarehouseAnsBillDetailVo>> selectByBillSid(String sid) {
 		return null;
 	}
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java

@@ -64,4 +64,7 @@ public interface WarehouseRackFeign {
     @ApiOperation("更改可用状态")
     @GetMapping("/updateIsEnable/{sid}/{isEnable}")
     public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable);
+    @ApiOperation("根据仓库sid查询所有库位")
+    @GetMapping("/selectAll")
+    public ResultBean<List<WarehouseRackVo>> selectAll(@RequestParam("ckSid") String ckSid);
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java

@@ -66,4 +66,9 @@ public class WarehouseRackFeignFallback implements WarehouseRackFeign {
 	public ResultBean updateIsEnable(String sid, String isEnable) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<WarehouseRackVo>> selectAll(String ckSid) {
+		return null;
+	}
 }