yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

入库接口的调整

master
djz8236 2 years ago
parent
23b1fd61b9
commit
7c42c0bfe5
7 changed files with 83 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java
  2. 2
      warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java
  3. 55
      warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java
  4. 4
      warehousing-system/project/wh-manage/src/main/java/com/wh/service/instorehouse/PutInServiceImpl.java
  5. 10
      warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
  6. 30
      warehousing-system/project_web/src/components/instorehouse/putIn.vue
  7. 1
      warehousing-system/project_web/src/main.js

2
warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java
View File

@ -29,7 +29,7 @@ public class PurchasenewController {
@PostMapping("/listAll")
public ResultBean<List<Purchasenew>> listAll(){
ResultBean rb = ResultBean.fireFail();
List<Purchasenew> list = purchasenewService.list();
List<Purchasenew> list = purchasenewService.listForInput();
return rb.success().setData(list);
}

2
warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java
View File

@ -71,4 +71,6 @@ public interface PurchasenewMapper extends BaseMapper<Purchasenew> {
*/
@Update("update purchasenew set status='2' where sid=#{sid}")
int updatePutInStatus(@Param("sid") String sid);
@Select("select * from purchasenew where state=1")
List<Purchasenew> listForInput();
}

55
warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java
View File

@ -18,6 +18,7 @@ import com.wh.pojo.purchasenew.Purchasenew;
import com.wh.pojo.purchasenew.PurchasenewDto;
import com.wh.pojo.purchasenewproduct.PurchasenewProduct;
import com.wh.pojo.purchasenewproduct.PurchasenewProductDto;
import com.wh.pojo.purchasenewproduct.PurchasenewProductVo;
import com.wh.service.api.prodstock.ProdStockService;
import com.wh.service.purchasenew.PurchasenewService;
import com.wh.service.purchasenewproduct.PurchasenewProductService;
@ -53,7 +54,8 @@ public class InStorehouseMainService extends MybatisBaseService<InStorehouseMai
private PurchasenewService purchasenewService;
@Autowired
private PurchasenewProductService purchasenewProductService;
@Transactional
@Autowired
private InStorehouseMainService inStorehouseMainService;
public ResultBean addInStorehouse(InStoreHouseMainDto inStoreHouseMainDto) {
ResultBean<Object> r = ResultBean.fireFail();
if(inStoreHouseMainDto==null){
@ -62,21 +64,58 @@ public class InStorehouseMainService extends MybatisBaseService<InStorehouseMai
if(StringUtils.isBlank(inStoreHouseMainDto.getNo())){
return r.setMsg("申请单编号不能为空");
}
QueryWrapper<Purchasenew> purchasenewWrapper = new QueryWrapper<>();
purchasenewWrapper.eq("purchase_no",inStoreHouseMainDto.getNo());
List<Purchasenew> list1 = purchasenewService.list(purchasenewWrapper);
if(list1==null||list1.size()==0){
return r.setMsg("申请单不存在");
}
Purchasenew purchasenew = list1.get(0);
PurchasenewDto dto =new PurchasenewDto();
BeanUtil.copyProperties(purchasenew,dto);
String purchaseSid=purchasenew.getSid();
QueryWrapper<InStorehouseMain> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("no",inStoreHouseMainDto.getNo());
if(baseMapper.selectCount(queryWrapper) != 0){
return r.setMsg("申请单编号已经存在");
queryWrapper.eq("purchase_sid",purchasenew.getSid());
List<InStorehouseMain> inStorehouseMains = baseMapper.selectList(queryWrapper);
if(inStorehouseMains!=null&&inStorehouseMains.size()>0){
return r.setMsg("申请单编号已经入库");
}
List<PurchasenewProductVo> purchasenewProductVos =
purchasenewProductService.fetchDetailsVoByPurchaseSid(purchaseSid);
List<PurchasenewProductDto> products=new ArrayList<>();
for (PurchasenewProductVo purchasenewProductVo : purchasenewProductVos) {
PurchasenewProductDto d=new PurchasenewProductDto();
BeanUtil.copyProperties(purchasenewProductVo,d);
products.add(d);
}
dto.setProducts(products);
saveOrUpdateByPurchaseSid(dto,purchaseSid);
// InStorehouseMain in=new InStorehouseMain();
// BeanUtils.copyProperties(inStoreHouseMainDto,in);
// List<InStorehouseListing> list = inStoreHouseMainDto.getList();
// if(list==null||list.size()==0){
// return r.setMsg("商品不能为空");
// }
// //申请单主表信息
// baseMapper.insert(in);
// addListing(in, list);
return ResultBean.fireSuccess().setMsg("添加成功");
}
@Transactional
public ResultBean addInStorehouses(InStoreHouseMainDto inStoreHouseMainDto) {
ResultBean<Object> r = ResultBean.fireFail();
InStorehouseMain in=new InStorehouseMain();
BeanUtils.copyProperties(inStoreHouseMainDto,in);
List<InStorehouseListing> list = inStoreHouseMainDto.getList();
if(list==null||list.size()==0){
return r.setMsg("商品不能为空");
}
//申请单主表信息
baseMapper.insert(in);
addListing(in, list);
purchasenewService.updateStateToInputBySid(in.getPurchaseSid());
return ResultBean.fireSuccess().setMsg("添加成功");
}
public PagerVo<InStoreHouseMainVo> listPage(PagerQuery<InStorehouseMainQuery> pq) {
InStorehouseMainQuery query = pq.getParams();
@ -271,7 +310,7 @@ public class InStorehouseMainService extends MybatisBaseService<InStorehouseMai
});
inStoreHouseMainDto.setList(list);
inStoreHouseMainDto.setPurchaseSid(purchaseSid);//采购申请单的sid
addInStorehouse(inStoreHouseMainDto);
addInStorehouses(inStoreHouseMainDto);
return r.success();
}

4
warehousing-system/project/wh-manage/src/main/java/com/wh/service/instorehouse/PutInServiceImpl.java
View File

@ -75,7 +75,7 @@ public class PutInServiceImpl implements PutInService {
List<Location> locationList = locationMapper.selectList(locationQueryWrapper);
List<String> receivingIdList = new ArrayList<>();
List<String> locationIdList = new ArrayList<>();
List<Location> locationIdList = new ArrayList<>();
for (Receiving receiving : receivingList){
receivingIdList.add(receiving.getReceivingId());
@ -83,7 +83,7 @@ public class PutInServiceImpl implements PutInService {
if (locationList != null){
for (Location location : locationList){
locationIdList.add(location.getLocationId());
locationIdList.add(location);
}
}

10
warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
View File

@ -172,4 +172,14 @@ public class PurchasenewService extends MybatisBaseService<PurchasenewMapper, Pu
int i=baseMapper.updatePutInStatus(sid);
return rb.success();
}
public List<Purchasenew> listForInput() {
return baseMapper.listForInput();
}
public void updateStateToInputBySid(String purchaseSid) {
Purchasenew purchasenew = fetchBySid(purchaseSid);
purchasenew.setState(2);
baseMapper.updateById(purchasenew);
}
}

30
warehousing-system/project_web/src/components/instorehouse/putIn.vue
View File

@ -22,7 +22,7 @@
:key="i"
:label="item.purchaseNo"
:value="item.purchaseNo"
>
>
</el-option>
</el-select>
</el-form-item>
@ -36,7 +36,7 @@
<el-option
v-for="(item,i) in huoweiId"
:key="i"
:label="item.locationId"
:label="item.name"
:value="item.locationId"
>
</el-option>
@ -68,13 +68,16 @@ export default {
data() {
return {
user: "",
dingdanId: {},
huoweiId: {},
dingdanId: [],
huoweiId: [],
inStorehouse: {
inStorehouseId: "",
receivingId: "",
locationId: "",
remarks: "",
no:'',
storeHouseSid:"",
storeHouseName:"",
createPerson: "",
checkPerson: "",
status: "",
@ -85,7 +88,7 @@ export default {
size: 100,
params: {
purchaseNo:''
}
}
},
queryPamas: {
query: '',
@ -104,9 +107,9 @@ export default {
},
methods: {
async getOptions() {
const { data: result } = await this.$http.post('/purchasenew/listPage', { params: this.queryInfos })
const { data: result } = await this.$http.post('/purchasenew/listAll', { params: this.queryInfos })
const { data: datas } = await this.$http.get('/location/list', { params: this.queryPamas })
this.dingdanId = result.data.records;
this.dingdanId = result.data;
this.huoweiId = datas.data.rows;
},
@ -117,13 +120,22 @@ export default {
this.inStorehouse.createPerson = this.user;
const now = new Date();
this.inStorehouse.inStorehouseId = "IN" + now.getTime();
this.inStorehouse.no = this.inStorehouse.receivingId
this.inStorehouse.storeHouseSid = this.inStorehouse.locationId
let location =this.huoweiId.find((item)=>{
return item.locationId === this.inStorehouse.locationId;//筛选出匹配数据
})
this.inStorehouse.storeHouseName= location.name;
// const { data: result } = await this.$http.post('/putIn/addInStorehouse', this.inStorehouse)
const { data: result } = await this.$http.post(
"/input/addInStorehouse",
this.inStorehouse
);
if (result.status === 201) return this.$message.error("入库失败");
this.$message.success(result.data);
if (result.code != 200){
alert(result.msg);
return ;
}
alert('操作成功');
this.$refs.onPutInRuleForm.resetFields();
});
},

1
warehousing-system/project_web/src/main.js
View File

@ -18,7 +18,6 @@ import axios from 'axios'
/* 设定axios的请求根目录 */
axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/'
//axios.defaults.baseURL = 'http://127.0.0.1:9050/'
// axios.defaults.baseURL = 'http://192.168.3.183:9050/'
// axios.defaults.baseURL = 'http://manage.jt.com/'
// axios.defaults.baseURL = 'http://yichuwh.com/'

Write Preview
Loading…
Cancel
Save