wms / wms_ningbohaitian · Files

Blame view

src/main/java/com/huaheng/api/general/controller/ReceiptApiController.java 12.9 KB
Edit Raw Normal View History
出入库单接口
a016ba5d
 
pengcheng authored 
1
2
3
 
package com.huaheng.api.general.controller;
白皮书内容更新
6d43f89e
 
lector authored 
4
5
 
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
增加查询库位的接口
fab3f212
 
游杰 authored 
6
7
 
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
宁波海天项目调试
1dba0bc7
 
游杰 authored 
8
9
 
import com.baomidou.mybatisplus.extension.api.R;
import com.huaheng.api.general.domain.*;
出入库单接口
a016ba5d
 
pengcheng authored 
10
 
import com.huaheng.api.general.service.ReceiptApiService;
删除多余配置，接口修改
340ed777
 
xqs authored 
11
 
import com.huaheng.api.general.service.ReceiptService;
宁波海天项目调试
1dba0bc7
 
游杰 authored 
12
 
import com.huaheng.api.general.service.ShipmentApiService;
增加查询库位的接口
fab3f212
 
游杰 authored 
13
 
import com.huaheng.common.constant.QuantityConstant;
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
14
 
import com.huaheng.common.utils.StringUtils;
增加查询库位的接口
fab3f212
 
游杰 authored 
15
 
import com.huaheng.common.utils.security.ShiroUtils;
接口加上日志注解
0b6c3407
 
周峰 authored 
16
 
import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
出入库单接口
a016ba5d
 
pengcheng authored 
17
18
19
 
import com.huaheng.framework.aspectj.lang.annotation.Log;
import com.huaheng.framework.aspectj.lang.constant.BusinessType;
import com.huaheng.framework.web.domain.AjaxResult;
增加查询库位的接口
fab3f212
 
游杰 authored 
20
21
22
23
24
25
 
import com.huaheng.pc.config.location.domain.Location;
import com.huaheng.pc.config.location.domain.LocationInfo;
import com.huaheng.pc.config.location.domain.LocationStatus;
import com.huaheng.pc.config.location.service.LocationService;
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
完成联调
a79d1c7c
 
游杰 authored 
26
27
 
import com.huaheng.pc.receipt.detail.domain.Detail;
import com.huaheng.pc.receipt.detail.service.DetailServcie;
宁波海天项目调试
1dba0bc7
 
游杰 authored 
28
29
30
31
 
import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
出入库单接口
a016ba5d
 
pengcheng authored 
32
33
 
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
34
35
 
import io.swagger.annotations.ApiParam;
import org.apache.shiro.authz.annotation.RequiresPermissions;
出入库单接口
a016ba5d
 
pengcheng authored 
36
37
38
 
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
宁波海天项目调试
1dba0bc7
 
游杰 authored 
39
40
 
import java.math.BigDecimal;
import java.util.ArrayList;
白皮书内容更新
6d43f89e
 
lector authored 
41
 
import java.util.List;
增加查询库位的接口
fab3f212
 
游杰 authored 
42
 
import java.util.stream.Collectors;
出入库单接口
a016ba5d
 
pengcheng authored 
43
44
45
 

@RestController
@RequestMapping("/api/receiptApi")
阿里编码规范检测
122e4ff5
 
xqs authored 
46
 
@Api(tags = {"入库单接口"}, value = "入库单接口receipt")
优化ERP接口
89c16d2c
 
游杰 authored 
47
 
public class ReceiptApiController {
出入库单接口
a016ba5d
 
pengcheng authored 
48
49
50
 

    @Resource
    private ReceiptApiService receiptApiService;
删除多余配置，接口修改
340ed777
 
xqs authored 
51
52
 
    @Resource
    private ReceiptService receiptService;
宁波海天项目调试
1dba0bc7
 
游杰 authored 
53
54
 
    @Resource
    private ShipmentApiService shipmentApiService;
完成联调
a79d1c7c
 
游杰 authored 
55
56
 
    @Resource
    private DetailServcie detailServcie;
增加查询库位的接口
fab3f212
 
游杰 authored 
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
 
    @Resource
    private LocationService locationService;
    @Resource
    private InventoryDetailService inventoryDetailService;

    /**
     * 查询库位列表
     */
    @Log(title = "配置-库存资料-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
    @PostMapping("/getAllLocation")
    @ResponseBody
    public AjaxResult getAllLocation () {
        String type = "L";
        if(StringUtils.isEmpty(type)) {
            return AjaxResult.error("type不能为空");
        }
        String warehouseCode = "CS0001";
        String row = null, line = null, layer = null;

        /* 查询库位信息*/
        LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
        locationLambdaQueryWrapper.eq(StringUtils.isNotEmpty(row), Location::getIRow, row)
                .eq(StringUtils.isNotEmpty(line), Location::getIColumn, line)
                .eq(StringUtils.isNotEmpty(layer), Location::getILayer, layer)
                .eq(Location::getIGrid, 1) //
                .eq(StringUtils.isNotEmpty(type), Location::getLocationType, type)
                .eq(Location::getWarehouseCode, warehouseCode)
                .eq(StringUtils.isNotEmpty(type), Location::getZoneCode, type);
        List<Location> locations = locationService.list(locationLambdaQueryWrapper);
        List<Location> locationList = new ArrayList<>();

        /* 查询库存明细*/
        LambdaQueryWrapper<InventoryDetail> inventoryDetailLambda = Wrappers.lambdaQuery();
        inventoryDetailLambda.eq(InventoryDetail::getWarehouseCode, warehouseCode);
        List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambda);

        for (Location location1 : locations) {
            InventoryDetail inventoryDetail = null;
            String materialName = null;
            for (InventoryDetail inventoryDetail2 : inventoryDetailList) {
                if(location1.getCode().equals(inventoryDetail2.getLocationCode())) {
                    inventoryDetail = inventoryDetail2;
                }
            }
            List<InventoryDetail> inventoryDetails = inventoryDetailList.stream().filter(inventoryDetail1 ->
                    inventoryDetail1.getLocationCode().equals(location1.getCode())).collect(Collectors.toList());

            int userDef3 = 0;
            String status = location1.getStatus();
            String containerCode = location1.getContainerCode();
            List<String> materialNameList = inventoryDetails.stream().map(InventoryDetail::getMaterialName).collect(Collectors.toList());
            List<String> batchList = inventoryDetails.stream().map(InventoryDetail::getBatch).collect(Collectors.toList());
            List<String> materialCodeList = inventoryDetails.stream().map(InventoryDetail::getMaterialCode).collect(Collectors.toList());
            List<BigDecimal> qtyList = inventoryDetails.stream().map(InventoryDetail::getQty).collect(Collectors.toList());
            if(QuantityConstant.STATUS_LOCATION_EMPTY.equals(status)) {
                if(StringUtils.isEmpty(containerCode)) {
                    userDef3 = LocationStatus.IDLE_EMPTY_LOCATION;
                } else {
                    if(inventoryDetail == null) {
                        userDef3 = LocationStatus.IDLE_EMPTY_CONTAINER;
                    } else {
                        location1.setMaterialName(materialNameList);
                        location1.setMaterialCode(materialCodeList);
                        location1.setBatch(batchList);
                        location1.setQty(qtyList);
                        userDef3 = LocationStatus.IDLE_FULL_CONTAINER;
                    }
                }
            } else if(QuantityConstant.STATUS_LOCATION_LOCK.equals(status)) {
                if(StringUtils.isEmpty(containerCode)) {
                    userDef3 = LocationStatus.LOCK_EMPTY_LOCATION;
                } else {
                    if(inventoryDetail == null) {
                        userDef3 = LocationStatus.LOCK_EMPTY_CONTAINER;
                    } else {
                        location1.setMaterialName(materialNameList);
                        location1.setMaterialCode(materialCodeList);
                        location1.setBatch(batchList);
                        location1.setQty(qtyList);
                        userDef3 = LocationStatus.LOCK_FULL_CONTAINER;
                    }
                }
            }

            if(location1.getDeleted()) {
                if(StringUtils.isEmpty(containerCode)) {
                    userDef3 = LocationStatus.DISABLE_EMPTY_LOCATION;
                } else {
                    if(inventoryDetail == null) {
                        userDef3 = LocationStatus.DISABLE_EMPTY_CONTAINER;
                    } else {
                        location1.setMaterialName(materialNameList);
                        location1.setMaterialCode(materialCodeList);
                        location1.setBatch(batchList);
                        location1.setQty(qtyList);
                        userDef3 = LocationStatus.DISABLE_FULL_CONTAINER;
                    }
                }
            }

            location1.setUserDef3(String.valueOf(userDef3));
            locationList.add(location1);
        }
        return AjaxResult.success(locations);
    }
出入库单接口
a016ba5d
 
pengcheng authored 
162
163
164
165
166
167
168
169
 

    /**
     * 同步入库单
     */
    @Log(title = "入库单添加", action = BusinessType.INSERT)
    @PostMapping("/receipt")
    @ApiOperation("入库单添加公共接口")
    @ResponseBody
接口加上日志注解
0b6c3407
 
周峰 authored 
170
 
    @ApiLogger(apiName = "添加入库单", from="ERP")
完成联调
a79d1c7c
 
游杰 authored 
171
 
    public AjaxResult receipt(@RequestBody List<WmsReceipt> wmsReceipts)
出入库单接口
a016ba5d
 
pengcheng authored 
172
 
    {
宁波海天项目调试
1dba0bc7
 
游杰 authored 
173
 
        String warehouseCode = "CS0001";
完成联调
a79d1c7c
 
游杰 authored 
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
 
        AjaxResult ajaxResult = new AjaxResult();
        for(WmsReceipt wmsReceipt : wmsReceipts) {
            int operation = wmsReceipt.getOperationType();
            List<Detail> detailList = wmsReceipt.getDetailList();
            if (operation == 0) {
                ReceiptDomain receiptDomain = new ReceiptDomain();
                ReceiptHeader receiptHeader = new ReceiptHeader();
                receiptHeader.setReferCode(wmsReceipt.getBillNo());
                receiptHeader.setWarehouseCode(warehouseCode);
                receiptHeader.setCompanyCode("BHF");
                receiptHeader.setUserDef1(wmsReceipt.getTaksNo());
                receiptHeader.setCreatedBy("WMS");
                receiptHeader.setReceiptType("DE");
                receiptDomain.setReceiptHeader(receiptHeader);
                List<ReceiptDetail> receiptDetails = new ArrayList<>();
                BigDecimal qty = wmsReceipt.getQty();
                ReceiptDetail receiptDetail = new ReceiptDetail();
                receiptDetail.setWarehouseCode(warehouseCode);
                receiptDetail.setTotalQty(qty);
                receiptDetail.setMaterialCode(wmsReceipt.getItemCode());
                receiptDetail.setCompanyCode("BHF");
                receiptDetails.add(receiptDetail);
                receiptDomain.setReceiptDetails(receiptDetails);
                ajaxResult = receiptApiService.receipt(receiptDomain);
                if(!ajaxResult.hasErr()) {
                    detailServcie.saveBatch(detailList);
                }
            } else {
                ShipmentDomain shipmentDomain = new ShipmentDomain();
                ShipmentHeader shipmentHeader = new ShipmentHeader();
                shipmentHeader.setReferCode(wmsReceipt.getBillNo());
                shipmentHeader.setWarehouseCode(warehouseCode);
                shipmentHeader.setCompanyCode("BHF");
                shipmentHeader.setUserDef1(wmsReceipt.getTaksNo());
                shipmentHeader.setCreatedBy("WMS");
                shipmentHeader.setShipmentType("ELO");
                shipmentDomain.setShipmentHeader(shipmentHeader);
                List<ShipmentDetail> shipmentDetails = new ArrayList<>();
                String materialCode = wmsReceipt.getItemCode();
                BigDecimal qty = wmsReceipt.getQty();
                ShipmentDetail shipmentDetail = new ShipmentDetail();
                shipmentDetail.setWarehouseCode(warehouseCode);
                shipmentDetail.setShipQty(qty);
                shipmentDetail.setMaterialCode(materialCode);
                shipmentDetail.setCompanyCode("BHF");
                shipmentDetails.add(shipmentDetail);
                shipmentDomain.setShipmentDetails(shipmentDetails);
                ajaxResult = shipmentApiService.shipment(shipmentDomain);
                if(!ajaxResult.hasErr()) {
                    detailServcie.saveBatch(detailList);
                }
            }
        }
        return ajaxResult;
出入库单接口
a016ba5d
 
pengcheng authored 
228
229
 
    }
宁波海天项目调试
1dba0bc7
 
游杰 authored 
230
231
232
233
234
235
236
237
238
239
240
241
242
 
//    /**
//     * 同步入库单
//     */
//    @Log(title = "入库单添加", action = BusinessType.INSERT)
//    @PostMapping("/receipt")
//    @ApiOperation("入库单添加公共接口")
//    @ResponseBody
//    @ApiLogger(apiName = "添加入库单", from="ERP")
//    public AjaxResult receipt(@RequestBody WmsReceipt wmsReceipt)
//    {
//
//    }
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
243
生成空托盘组任务
f632a2d9
 
游杰 authored 
244
245
246
247
248
249
250
251
252
253
254
255
256
257
 
//    /**
//     * 入库单下发
//     */
//    @Log(title = "入库单下发", action = BusinessType.INSERT)
//    @PostMapping("/insertReceipt")
//    @ApiOperation("入库单下发接口")
//    @ResponseBody
//    @ApiLogger(apiName = "下发入库单", from="ERP")
//    public AjaxResult MaterialApi(@RequestBody Receipt receipt) {
//        System.out.println("————————开始接收入库单——————————");
//        System.out.println(receipt);
//        AjaxResult ajaxResult = receiptService.insertReceipt(receipt);
//        return ajaxResult;
//    }
删除多余配置，接口修改
340ed777
 
xqs authored 
258
259
 

    /**
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
260
261
262
263
264
 
     * 取消入库单
     */
    @Log(title = "入库-入库单 ",operating = "入库单删除", action = BusinessType.UPDATE)
    @PostMapping("/remove")
    @ResponseBody
接口加上日志注解
0b6c3407
 
周峰 authored 
265
 
    @ApiLogger(apiName = "取消入库单", from="ERP")
白皮书内容更新
6d43f89e
 
lector authored 
266
 
    public AjaxResult remove(@RequestBody List<String> receiptCodeList){
优化ERP接口
89c16d2c
 
游杰 authored 
267
 
        if (receiptCodeList==null && receiptCodeList.size()<1){
白皮书内容更新
6d43f89e
 
lector authored 
268
 
            return AjaxResult.error("单号列表为空");
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
269
 
        }
白皮书内容更新
6d43f89e
 
lector authored 
270
 
        return receiptApiService.remove(receiptCodeList);
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
271
272
 
    }
白皮书内容更新
6d43f89e
 
lector authored 
273
274
275
276
277
278
 
    /**
     * 入库单查询
     */
    @Log(title = "入库-入库单 ",operating = "入库单删除", action = BusinessType.UPDATE)
    @GetMapping("/search")
    @ResponseBody
生成空托盘组任务
f632a2d9
 
游杰 authored 
279
 
    @ApiLogger(apiName = "查询入库单", from="ERP")
白皮书内容更新
6d43f89e
 
lector authored 
280
281
282
283
284
 
    public AjaxResult search(@RequestParam String receiptCode,
                             @RequestParam String companyCode,
                             @RequestParam String warehouseCode){
        return receiptApiService.search(receiptCode,companyCode,warehouseCode);
    }
出入库单接口
a016ba5d
 
pengcheng authored 
285
 
}