验货入库

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

@@ -3,6 +3,8 @@ 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.basegoodssku.BaseGoodsSkuSelectList;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuService;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuDto;
@@ -37,4 +39,9 @@ public class BaseGoodsSkuRest {
     public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query) {
         return baseGoodsSkuService.listAllByOrg(query);
     }
+    @ApiOperation("入库添加商品列表")
+    @PostMapping("/getSelectList")
+    ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+        return baseGoodsSkuService.getSelectList(pagerQuery);
+    }
 }

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

@@ -55,5 +55,9 @@ public class PurchaseInventoryBillRest {
         return purchaseInventoryBillService.delAllBySids(sids);
     }
 
-
+    @ApiOperation("生成验货入库")
+    @PostMapping("/inspectionWarehousing")
+    ResultBean<String> inspectionWarehousing(@RequestBody PurchaseInventoryBillDto2 dto) {
+        return purchaseInventoryBillService.inspectionWarehousing(dto);
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java

@@ -2,6 +2,8 @@ package com.yxt.wms.biz.func.basegoodssku;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -15,22 +17,25 @@ public class BaseGoodsSkuSelectList {
     private String goodsSpuName;
     //商品sid
     private String goodsSkuSid;
+    //
+    private String goodsSkuTitle;
     //商品编码
     private String goodsSkuCode;
+    //条码
+    private String barCode;
     //规格/型号
-    private String goodsSkuTitle;
+    private String ownSpec;
+
     //计量单位
-    private String goodsUnitSid;
+    private String goodsUnitSid;//
-    private String goodsUnitName;
+    private String goodsUnitName;//单位
-    //仓库名称
+    private BigDecimal costPrice=new BigDecimal(0);//单价
-    //货位
+    private BigDecimal totalPrice=new BigDecimal(0);//总金额
-    //单位成本（进货价）
+    private String remarks;//备注
-    //数量
+    private Integer count=0;//数量
-    //税额
+    private String serialNumber;//序列号
-    //含税价
+    private String batch;//批次
-    //金额
+    private String warehouseRackSid;//
-    //销售价1
+    private String warehouseRackName;//库位
-    //销售价2
+    private String shelfLife;//保质期 天数
-    //操作时间
-    //操作人
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java

@@ -12,4 +12,6 @@ import lombok.Data;
 public class BaseGoodsSkuSelectQuery implements Query {
 
     private String goodsSkuCode;
+    private String goodsSpuName;
+    private String createOrgSid;
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuService.java

@@ -124,19 +124,8 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         return rb.success().setData(baseGoodsSkuDetailsVo);
     }
 
-    public PagerVo<BaseGoodsSkuSelectList> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
-        BaseGoodsSkuSelectQuery query = pagerQuery.getParams();
+        return baseGoodsSkuFeign.getSelectList(pagerQuery);
-        QueryWrapper<BaseGoodsSku> qw = new QueryWrapper<>();
-        if (query != null) {
-            //商品编码
-            if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-                qw.like("sku.goodsSkuCode", query.getGoodsSkuCode());
-            }
-        }
-        IPage<BaseGoodsSku> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<BaseGoodsSkuSelectList> pagging = baseMapper.getSelectList(page, qw);
-        PagerVo<BaseGoodsSkuSelectList> p = PagerUtil.pageToVo(pagging, null);
-        return p;
     }
 
     public ResultBean<PagerVo<BaseGoodsSkuPurSelectList>> purGoodsListPage(PagerQuery<BaseGoodsSkuPurSelectQuery> pq) {

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java

@@ -54,7 +54,7 @@ public class PurchaseInventoryBillDto2 {
     private String operatorName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("操作时间")
-    private Date operatorTime;
+    private String operatorTime;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java

@@ -11,7 +11,8 @@ import lombok.Data;
  **/
 @Data
 public class PurchaseInventoryBillQuery implements Query {
-
+    @ApiModelProperty("单据类型 0 :采购入库 1 验货入库")
+    private String billType;
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("外部单号")

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java

@@ -96,4 +96,9 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
     public ResultBean delAllBySids(String[] sids) {
         return purchaseInventoryBillFeign.delBySids(sids);
     }
+    public ResultBean<String> inspectionWarehousing(PurchaseInventoryBillDto2 dto) {
+        SysStaffinfo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySidP(dto.getUserSid()).getData();
+        dto.setUserName(sysStaffinfoDetailsVo.getName());
+        return purchaseInventoryBillFeign.inspectionWarehousing(dto);
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java

@@ -3,6 +3,8 @@ package com.yxt.wms.biz.func.purchaseinventorybilldetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -11,6 +13,7 @@ import lombok.Data;
 @Data
 public class PurchaseInventoryBillDetailDto2 {
 
+    private String sid;
     @ApiModelProperty("来源单sid")
     private String sourceBillSid;
     @ApiModelProperty("图示")
@@ -29,6 +32,7 @@ public class PurchaseInventoryBillDetailDto2 {
     private String goodsBarCode;
     @ApiModelProperty("规格值")
     private String specValue;
+    private String ownSpec;
     @ApiModelProperty("箱条码")
     private String boxBarCode;
     @ApiModelProperty("箱规格")
@@ -36,12 +40,14 @@ public class PurchaseInventoryBillDetailDto2 {
 
     @ApiModelProperty("单位")
     private String unit;
+    private String goodsUnitName;
     @ApiModelProperty("成本单价")
-    private double price;
+    private BigDecimal price;
+    private BigDecimal costPrice;
     @ApiModelProperty("总价")
-    private double totalPrice;
+    private BigDecimal totalPrice;
     @ApiModelProperty("数量")
-    private double count;
+    private BigDecimal count;
     @ApiModelProperty("辅助单位")
     private String auxiliaryUnits;
     @ApiModelProperty("序列号")

wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java

@@ -29,4 +29,5 @@ public class SysUserRoleDto implements Dto {
     
 	@ApiModelProperty("角色sid")
     private String roleSid;
+    private String orgSid;
 }

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeign.java

@@ -1,6 +1,10 @@
 package com.yxt.wms.feign.base.basegoodssku;
 
+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.basegoodssku.BaseGoodsSkuSelectList;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.ApiOperation;
@@ -30,5 +34,8 @@ public interface BaseGoodsSkuFeign {
     @ApiOperation("查询组织下所有商品")
     @PostMapping("/listAllByOrg")
     public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query);
+    @ApiOperation("入库添加商品列表")
+    @PostMapping("/getSelectList")
+    ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(@RequestBody PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery);
 
 }

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeignFallback.java

@@ -1,6 +1,10 @@
 package com.yxt.wms.feign.base.basegoodssku;
 
+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.basegoodssku.BaseGoodsSkuSelectList;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectQuery;
 import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
 import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.stereotype.Component;
@@ -23,4 +27,9 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{
     public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(OrgPathQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<BaseGoodsSkuSelectList>> getSelectList(PagerQuery<BaseGoodsSkuSelectQuery> pagerQuery) {
+        return null;
+    }
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java

@@ -44,5 +44,7 @@ public interface PurchaseInventoryBillFeign {
     @ApiOperation("删除/批量删除")
     @DeleteMapping("/delBySids")
     ResultBean delBySids(@RequestBody String[] sids);
-
+    @ApiOperation("生成验货入库")
+    @PostMapping("/inspectionWarehousing")
+    ResultBean<String> inspectionWarehousing(@RequestBody PurchaseInventoryBillDto2 dto);
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeignFallback.java

@@ -56,4 +56,9 @@ public class PurchaseInventoryBillFeignFallback implements PurchaseInventoryBill
 	public ResultBean delBySids(String[] sids) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<String> inspectionWarehousing(PurchaseInventoryBillDto2 dto) {
+		return null;
+	}
 }