diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java index 667deac0..350e6b48 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java @@ -17,4 +17,6 @@ public class InStoreHouseMainDetailVo implements Vo { private String approvedDate; // varchar 50 审核日期 private List list; private String purchaseSid;//采购申请单的sid + private String locationName; //货位名称 + private String locationId;//货位id } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java index e7ed659b..ab60f82b 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java @@ -25,6 +25,15 @@ public class InStoreHouseMainDto { private List list; private String purchaseSid;//采购申请单的sid private String locationId; + private String locationName; //货位名称 + + public String getLocationName() { + return locationName; + } + + public void setLocationName(String locationName) { + this.locationName = locationName; + } public String getLocationId() { return locationId; diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java index f8557c67..e15fed3d 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java @@ -19,4 +19,7 @@ public class InStoreHouseMainVo implements Vo { private String approvedDate; // varchar 50 审核日期 private String prodNum; // varchar 50 商品数量 private String purchaseSid;//采购申请单的sid + private String locationName; //货位名称 + private String locationId;//货位id + private String createTime;//入库日期 } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMain.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMain.java index c4d6f48e..7a1d75bf 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMain.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMain.java @@ -25,6 +25,24 @@ public class InStorehouseMain extends BaseEntity { private String approvedDate; // varchar 50 审核日期 private String approvedRemark; // varchar 50 审核备注 private String purchaseSid;//采购申请单的sid + private String locationName; //货位名称 + private String locationId;//货位id + + public String getLocationName() { + return locationName; + } + + public void setLocationName(String locationName) { + this.locationName = locationName; + } + + public String getLocationId() { + return locationId; + } + + public void setLocationId(String locationId) { + this.locationId = locationId; + } public String getNo() { return no; diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java index 73f412d7..f42ffde4 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java @@ -23,6 +23,24 @@ public class InStorehouseMainQuery implements Query { private String approvedDate; // varchar 50 审核日期 private String approvedRemark; // varchar 50 审核备注 private String purchaseSid;//采购申请单的sid + private String locationName; //货位名称 + private String locationId;//货位id + + public String getLocationName() { + return locationName; + } + + public void setLocationName(String locationName) { + this.locationName = locationName; + } + + public String getLocationId() { + return locationId; + } + + public void setLocationId(String locationId) { + this.locationId = locationId; + } public String getSid() { return sid; diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java index 2ee8602b..efcff1e6 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java @@ -16,4 +16,5 @@ public class OutStorehouseMainQuery implements Query { private String creatorName; /// varchar 50 制单人姓名 private String custerName; // varchar 100 客户名称（企业） private String mainSid; // varchar 100 mainSid + private String state; } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseVo.java index 84c60719..e4ca77bb 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseVo.java @@ -19,4 +19,6 @@ public class OutStorehouseVo implements Vo { private String auditorName; // varchar 50 审核人姓名 private String approvedDate; // varchar 50 审核日期 private String prodNum; // varchar 50 商品数量 + private String modifyTime; //修改日期 + private String state; } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewForImportDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewForImportDto.java new file mode 100644 index 00000000..62b92d09 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewForImportDto.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenew; + + +import com.wh.pojo.purchasenewproduct.PurchasenewProductDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewDto.java
+ * Class: com.wh..api.purchasenew.PurchasenewDto
+ * Description: 采购订单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单 数据传输对象", description = "采购订单 数据传输对象") +public class PurchasenewForImportDto implements Dto { + + private String sid; // sid + @ApiModelProperty("订单日期") + private String purchaseDate; // 订单日期 + @ApiModelProperty("订单编号") + private String purchaseNo; // 订单编号 + @ApiModelProperty("采购人员") + private String purchasePerson; // 采购人员 + @ApiModelProperty("采购人员sid") + private String purchasePersonSid; // 采购人员sid + @ApiModelProperty("客户id") + private String custId; // 客户id + @ApiModelProperty("客户名称") + private String custName; // 客户名称 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商id") + private String supplierId; // 供应商id + @ApiModelProperty("仓库名称") + private String storehouseName; // 仓库名称 + @ApiModelProperty("仓库id") + private String storehouseId; // 仓库id + @ApiModelProperty("仓库id") + private String locationId; + @ApiModelProperty("仓库id") + private String locationNumber; + @ApiModelProperty("商品列表") + private List products; + } \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java index 473f1f57..98d8301e 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java @@ -70,7 +70,9 @@ public class PurchasenewQuery implements Query { private String storehouseName; // 仓库名称 @ApiModelProperty("仓库id") private String storehouseId; // 仓库id +// @ApiModelProperty("状态") +// private String status; // 状态 @ApiModelProperty("状态") - private String status; // 状态 + private String state; // 状态 } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java index bd82dee6..1ed0aa46 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java @@ -87,6 +87,8 @@ public class PurchasenewProductDto implements Dto { private String realityCalculatedValue; // 实际核算的价值 @ApiModelProperty("货位号") private String locationNumber; // 货位号 + @ApiModelProperty("货位id") + private String locationId; // 货位号id @ApiModelProperty("申请单的sid") private String mainSid; // 申请单的sid @ApiModelProperty("质物id") diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java index 88cbb570..01ce5ae8 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.wh.feign.enterpriseinformation.WhEnterpriseInformationFeign; import com.wh.feign.enterpriseinformation.WhEnterpriseInformationQuery; import com.wh.pojo.api.*; +import com.wh.pojo.purchasenew.PurchasenewQuery; +import com.wh.pojo.purchasenew.PurchasenewVo; import com.wh.service.api.instorehouse.InStorehouseMainService; import com.wh.service.purchasenew.PurchasenewService; import com.wh.service.purchasenewproduct.PurchasenewProductService; @@ -12,6 +14,7 @@ import com.wh.vo.SysResult; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,7 +35,14 @@ public class InStoreHouseMainController { private PurchasenewProductService purchasenewProductService; @Resource private WhEnterpriseInformationFeign enterpriseInformationFeign; - +// @ApiOperation("根据条件分页查询数据的列表") +// @PostMapping("/listPage") +// public ResultBean> listPage(@RequestBody PagerQuery pq){ +// pq.getParams().setState("2"); +// ResultBean rb = ResultBean.fireFail(); +// PagerVo pv = purchasenewService.listPageVo(pq); +// return rb.success().setData(pv); +// } @PostMapping("addInStorehouse") public ResultBean addInStorehouse(@RequestBody InStoreHouseMainDto inStoreHouseMainDto){ log.info("/input/addInStorehouse:{}", JSONObject.toJSONString(inStoreHouseMainDto)); @@ -44,7 +54,7 @@ public class InStoreHouseMainController { log.info("/input/addInStorehouseByPurchase:{}", JSONObject.toJSONString(purchaseInStoreHouseParams)); return inStorehouseMainService.addInStorehouseByPurchase(purchaseInStoreHouseParams); } - @PostMapping("listPage") + @PostMapping("listPage") public ResultBean listPage(@RequestBody PagerQuery pq){ PagerVo pv = inStorehouseMainService.listPage(pq); ResultBean> r = ResultBean.fireSuccess(); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java index 0c1724cb..ac92e96e 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java @@ -14,6 +14,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + +import java.util.List; + @Slf4j @RestController @CrossOrigin @@ -45,6 +48,12 @@ public class OutStorehouseMainController { ResultBean> r = ResultBean.fireSuccess(); return r.setData(pv); } + @PostMapping("listAllForPicking") + public ResultBean listAllForPicking(){ + ResultBean r=ResultBean.fireFail(); + List list= outStorehouseMainService.listAllForPicking(); + return r.success().setData(list); + } @GetMapping("getOutStorehouse/{sid}") public ResultBean getOutStorehouse(@PathVariable(value = "sid") String sid){ return outStorehouseMainService.getOutStorehouse(sid); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/prodstock/ProdStockController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/prodstock/ProdStockController.java index ca6a05f5..e69b932f 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/prodstock/ProdStockController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/api/prodstock/ProdStockController.java @@ -34,7 +34,7 @@ public class ProdStockController { if(list.size()>0){ List prodStocks = prodStockService.importStock(list); if(prodStocks.size()>0){ - return rb.fail().setData(prodStocks).setMsg("部分数据导入失败"); + return rb.fail().setData(prodStocks).setMsg("部分数据导入失败,商品、仓库信息不能为空"); } }else{ return rb.setMsg("导入失败"); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/outstorehouse/PickingController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/outstorehouse/PickingController.java index 4a4abb64..d6283b7d 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/outstorehouse/PickingController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/outstorehouse/PickingController.java @@ -4,13 +4,17 @@ import com.alibaba.fastjson.JSONObject; import com.wh.pojo.Picking; import com.wh.pojo.api.OutStorehouseListing; import com.wh.pojo.api.OutStorehouseMain; +import com.wh.pojo.api.OutStorehouseMainQuery; +import com.wh.pojo.api.OutStorehouseVo; import com.wh.service.api.outstorehouse.OutStorehouseListingService; import com.wh.service.api.outstorehouse.OutStorehouseMainService; import com.wh.service.outstorehouse.PickingService; import com.wh.vo.PageResult; import com.wh.vo.PickingUser; import com.wh.vo.SysResult; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -26,7 +30,15 @@ public class PickingController { @Autowired private PickingService pickingService; - + @Autowired + private OutStorehouseMainService outStorehouseMainService; + @PostMapping("listPage") + public ResultBean listPage(@RequestBody PagerQuery pq){ + pq.getParams().setState("2"); + PagerVo pv = outStorehouseMainService.listPage(pq); + ResultBean> r = ResultBean.fireSuccess(); + return r.setData(pv); + } @GetMapping("getOptions") public SysResult getOptions(){ List outStorehouseIdList = pickingService.getOptions(); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java index 0802bd3a..fbad3853 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java @@ -44,7 +44,7 @@ public class PurchasenewController { @ApiOperation("导入采购订单 入库") @PostMapping("/importPurchase") - public ResultBean importPurchase(@RequestBody PurchasenewDto dto){ + public ResultBean importPurchase(@RequestBody PurchasenewForImportDto dto){ log.info("/stock/importStock:{}", JSONObject.toJSONString(dto)); return purchasenewService.importPurchase(dto); } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java index eb1279fe..b7bfc51f 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/shstorehouse/ShStorehouseRest.java @@ -129,7 +129,6 @@ public class ShStorehouseRest { ResultBean rb = ResultBean.fireFail(); return rb.success().setData(shStorehouseService.list()); } - @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody ShStorehouseDto dto){ diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java index c8557cb4..97878300 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java @@ -10,10 +10,14 @@ import com.wh.pojo.api.OutStorehouseMain; import com.wh.pojo.api.OutStorehouseVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; @Mapper public interface OutStorehouseMainMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - +@Select("select * from out_storehouse_main where state=1;") + List listAllForPicking(); } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java index b2ee0e4f..ef751e9b 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java @@ -11,6 +11,12 @@ public interface ProdStockMapper extends BaseMapper { @Update("update prod_stock set num=num-#{num} , calculated_value=(num*confirmed_price) where pro_sid=#{proSid} and custer_sid=#{custerSid}") void reduceNumByProdSidAndCustSid(@Param("proSid") String proSid, @Param("custerSid")String custerSid, @Param("num")String num); - @Update("update prod_stock set num=num+#{num}, calculated_value=(num*confirmed_price) where pro_sid=#{proSid} and custer_sid=#{custerSid}") - void addNumByProdSidAndCustSid(String proSid, String custerSid, String num); + @Update("update prod_stock set num=num+#{num}, calculated_value=(num*confirmed_price) " + + " where pro_sid=#{proSid} and custer_sid=#{custerSid} and store_house_sid=#{storehousesid}" + + " and location_number=#{locationnum}") + void addNumByProdSidAndCustSid(@Param("proSid")String proSid, @Param("custerSid")String custerSid, + @Param("num")String num, @Param("storehousesid")String storehousesid, + @Param("locationnum")String locationnum); + @Update("update prod_stock set num=num-#{num} , calculated_value=#{value} where id=#{id} ") + void updateByProdStockId(@Param("num")String num, @Param("value")String value, @Param("id")int id); } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java index e58ad0aa..cdc65790 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java @@ -10,10 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.wh.api.Api; import com.wh.mapper.api.instorehouse.InStorehouseMainMapper; import com.wh.mapper.initial.LocationMapper; -import com.wh.pojo.InStorehouse; -import com.wh.pojo.Location; -import com.wh.pojo.Purchase; -import com.wh.pojo.Receiving; +import com.wh.pojo.*; import com.wh.pojo.api.*; import com.wh.pojo.purchasenew.Purchasenew; import com.wh.pojo.purchasenew.PurchasenewDto; @@ -22,6 +19,7 @@ import com.wh.pojo.purchasenewproduct.PurchasenewProductDto; import com.wh.pojo.purchasenewproduct.PurchasenewProductVo; import com.wh.service.api.prodstock.ProdStockService; import com.wh.service.initial.LocationService; +import com.wh.service.initial.ProductService; import com.wh.service.purchasenew.PurchasenewService; import com.wh.service.purchasenewproduct.PurchasenewProductService; import com.yxt.common.base.service.MybatisBaseService; @@ -38,10 +36,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Positive; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Slf4j @Service @@ -61,6 +56,8 @@ public class InStorehouseMainService extends MybatisBaseService r = ResultBean.fireFail(); @@ -74,6 +71,9 @@ public class InStorehouseMainService extends MybatisBaseService purchasenewWrapper = new QueryWrapper<>(); purchasenewWrapper.eq("purchase_no",inStoreHouseMainDto.getNo()); List list1 = purchasenewService.list(purchasenewWrapper); @@ -99,6 +99,7 @@ public class InStorehouseMainService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("sid",purchaseSid); + Purchasenew one = purchasenewService.getOne(qw); + one.setState(2); + one.setModifyTime(new Date()); + purchasenewService.updateById(one); + + //purchasenewService.updateStateToInputBySid(in.getPurchaseSid()); return ResultBean.fireSuccess().setMsg("添加成功"); @@ -206,6 +216,9 @@ public class InStorehouseMainService extends MybatisBaseService data = (List) productListByNameAndCode.getData(); + if(data.size()==0){ + Product product=new Product(); + product.setName(l.getProName()); + product.setBarCode(l.getProSid()); + productService.addProduct(product); + } + } } /** @@ -255,6 +278,7 @@ public class InStorehouseMainService extends MybatisBaseService proStocks = prodStockService.getProStocks(pq); return proStocks; @@ -292,6 +316,8 @@ public class InStorehouseMainService extends MybatisBaseService { @@ -136,7 +135,16 @@ public class OutStorehouseMainService extends MybatisBaseService queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sid",mainSid); + OutStorehouseMain outStorehouseMain = baseMapper.selectOne(queryWrapper); + outStorehouseMain.setModifyTime(new Date()); + outStorehouseMain.setState(2); + baseMapper.updateById(outStorehouseMain); + BigDecimal multiply = new BigDecimal(prodStock.getNum()).multiply(new BigDecimal(prodStock.getConfirmedPrice())); + prodStockService.updateByProdStockId(prodStock.getNum(),multiply.toString(),prodStock.getId()); + } /** @@ -209,6 +217,9 @@ public class OutStorehouseMainService extends MybatisBaseService list=outStorehouseListingService.selectInStorehouseListingsByMainSid(sid); int ii=outStorehouseListingService.deleteByMainSid(sid); list.forEach(l->{ - prodStockService.addNumByProdSidAndCustSid(l.getProSid(), l.getCusterSid(),l.getRealityNum()); + prodStockService.addNumByProdSidAndCustSid(l.getProSid(), l.getCusterSid(),l.getRealityNum(), + l.getStoreHouseSid(), l.getLocationNumber()); }); return i; } @@ -241,10 +253,14 @@ public class OutStorehouseMainService extends MybatisBaseService listAllForPicking() { + return baseMapper.listAllForPicking(); + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java index 4693eca8..183a5146 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java @@ -5,13 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wh.mapper.api.prodstock.ProdStockMapper; +import com.wh.pojo.Product; import com.wh.pojo.api.*; +import com.wh.service.initial.ProductService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,7 +26,8 @@ import java.util.Map; @Slf4j @Service public class ProdStockService extends MybatisBaseService { - + @Autowired + private ProductService productService; public PagerVo getProStocks(PagerQuery pq ) { ProdStockQuery params = pq.getParams(); QueryWrapper qw = createQueryWrapper(params); @@ -62,6 +67,9 @@ public class ProdStockService extends MybatisBaseService importStock(List list) { @@ -81,18 +89,35 @@ public class ProdStockService extends MybatisBaseService columnMap=new HashMap<>(); columnMap.put("store_house_sid",storeHouseSid); - columnMap.put("custer_sid",custerSid); + // columnMap.put("custer_sid",custerSid); columnMap.put("pro_sid",proSid); - baseMapper.deleteByMap(columnMap); + columnMap.put("pro_model",l.getProModel()); + columnMap.put("pro_name",l.getProName()); + baseMapper.deleteByMap(columnMap); //依据最新的库存为准 之前的库存删了 baseMapper.insert(l); + + ResultBean productListByNameAndCode = productService.getProductListByNameAndCode(l.getProName(), proSid); + if (productListByNameAndCode.getSuccess()){ + List data = (List) productListByNameAndCode.getData(); + if(data.size()==0){ + Product product=new Product(); + product.setName(l.getProName()); + product.setBarCode(proSid); + productService.addProduct(product); + } + } } return r; } + + public void updateByProdStockId(String num, String value, Integer id) { + baseMapper.updateByProdStockId(num,value,id); + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductService.java index 995b5354..af7ca276 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductService.java @@ -1,8 +1,11 @@ package com.wh.service.initial; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.wh.pojo.Product; import com.wh.pojo.Storehouse; import com.wh.vo.PageResult; +import com.yxt.common.core.result.ResultBean; +import org.springframework.util.StringUtils; import java.util.List; @@ -16,4 +19,26 @@ public interface ProductService { void deleteProduct(String barCode); List getStorehouse(); + + /** + * 根据名称 code去查询商品 + * @param name + * @param code + * @return + */ + public ResultBean> getProductListByNameAndCode(String name, String code) ; + + /** + * 根据名称 去查询商品 + * @param name + * @return + */ + public ResultBean> getProductListByName(String name) ; + + /** + * 根据 code 去查询商品 + * @param code + * @return + */ + public ResultBean> getProductListByCode(String code); } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductServiceImpl.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductServiceImpl.java index ec23d3ea..80318b40 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductServiceImpl.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/initial/ProductServiceImpl.java @@ -7,6 +7,7 @@ import com.wh.mapper.initial.StorehouseMapper; import com.wh.pojo.Product; import com.wh.pojo.Storehouse; import com.wh.vo.PageResult; +import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -37,7 +38,27 @@ public class ProductServiceImpl implements ProductService{ // System.out.println(productPage.getRecords().size()); return pageResult; } - + public ResultBean> getProductListByNameAndCode(String name,String code) { + ResultBean rb=ResultBean.fireFail(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(StringUtils.isEmpty(name)&&StringUtils.isEmpty(code)){ + return rb.setMsg("参数为空"); + } + if (!StringUtils.isEmpty(name)){ + queryWrapper.eq("name",name); + } + if (!StringUtils.isEmpty(code)){ + queryWrapper.eq("bar_code",code); + } + List products = productMapper.selectList(queryWrapper); + return rb.success().setData(products); + } + public ResultBean> getProductListByName(String name) { + return getProductListByNameAndCode(name,null); + } + public ResultBean> getProductListByCode(String code) { + return getProductListByNameAndCode(null,code); + } @Override public void addProduct(Product product) { productMapper.insert(product); diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java index ad780e25..d119b29f 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java @@ -59,6 +59,9 @@ public class PurchasenewService extends MybatisBaseService> listResultBean = whEnterpriseInformationFeign.EnterpriseList(); - List data = listResultBean.getData(); - data.forEach(d->{ - String enterpriseName = d.getEnterpriseName(); - String sid = d.getSid(); - if(sid.equals(custId)){ - dto.setCustName(enterpriseName); - } - }); +// String custId = dto.getCustId(); +// ResultBean> listResultBean = whEnterpriseInformationFeign.EnterpriseList(); +// List data = listResultBean.getData(); +// data.forEach(d->{ +// String enterpriseName = d.getEnterpriseName(); +// String sid = d.getSid(); +// if(sid.equals(custId)){ +// dto.setCustName(enterpriseName); +// } +// }); String dtoSid = dto.getSid(); List products = dto.getProducts(); if(products.size()==0){ @@ -210,14 +213,18 @@ public class PurchasenewService extends MybatisBaseService