|
@@ -1,5 +1,6 @@
|
|
|
package com.ruoyi.web.controller.warehouse.warehouseBusiness;
|
|
|
|
|
|
+import com.ruoyi.common.annotation.DataScope;
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
import com.ruoyi.common.annotation.RepeatSubmit;
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
@@ -37,6 +38,7 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
* 查询出库详情主表列表
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:list')")
|
|
|
+ @DataScope(deptAlias = "d", userAlias = "u")
|
|
|
@GetMapping("/list")
|
|
|
public TableDataInfo list(TWarehouseBills tWarehouseBills) {
|
|
|
startPage();
|
|
@@ -51,17 +53,41 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
* 查询出库详情主表列表
|
|
|
*/
|
|
|
@GetMapping("/getWarehouseOutStock")
|
|
|
+ @DataScope(deptAlias = "d", userAlias = "u")
|
|
|
public String getWarehouseOutStockBillsNo(TWarehouseBills tWarehouseBills) {
|
|
|
return itWarehouseBillsService.getWarehouseOutStockBillsNo(tWarehouseBills);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 出库提交
|
|
|
+ */
|
|
|
+ @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
|
|
|
+ @Log(title = "详情主表", businessType = BusinessType.INSERT)
|
|
|
+ @PostMapping(value = "/warehouseSubmission")
|
|
|
+ @RepeatSubmit
|
|
|
+ public AjaxResult warehouseSubmission(@RequestParam("tWarehouseBills") String tWarehouseBills,
|
|
|
+ @RequestParam("tEnclosure") String tEnclosure,
|
|
|
+ @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
|
|
|
+ @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
|
|
|
+ @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
|
|
|
+ String billsType = "SJCK";
|
|
|
+ if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
|
|
|
+ return AjaxResult.error("未找到仓库主表数据,请确认");
|
|
|
+ }
|
|
|
+ if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
|
|
|
+ return AjaxResult.error("未找到仓库明细数据,请确认");
|
|
|
+ }
|
|
|
+ LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
|
|
|
+ return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
|
|
|
+ tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 导出出库详情主表列表
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:export')")
|
|
|
@Log(title = "详情主表", businessType = BusinessType.EXPORT)
|
|
|
+ @RepeatSubmit
|
|
|
@GetMapping("/export")
|
|
|
public AjaxResult export(TWarehouseBills tWarehouseBills) {
|
|
|
tWarehouseBills.setfBilltype("SJCK");
|
|
@@ -75,6 +101,7 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:query')")
|
|
|
@GetMapping(value = "/{fId}")
|
|
|
+ @RepeatSubmit
|
|
|
public AjaxResult getInfo(@PathVariable("fId") Long fId) {
|
|
|
return AjaxResult.success(itWarehouseBillsService.selectTWarehousebillsById(fId));
|
|
|
}
|
|
@@ -85,6 +112,7 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
|
|
|
@Log(title = "详情主表", businessType = BusinessType.INSERT)
|
|
|
@PostMapping(value = "/add")
|
|
|
+ @RepeatSubmit
|
|
|
public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
|
|
|
@RequestParam("tEnclosure") String tEnclosure,
|
|
|
@RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
|
|
@@ -110,6 +138,7 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:edit')")
|
|
|
@Log(title = "详情主表", businessType = BusinessType.UPDATE)
|
|
|
@PutMapping
|
|
|
+ @RepeatSubmit
|
|
|
public AjaxResult edit(@RequestBody TWarehouseBills tWarehouseBills) {
|
|
|
return toAjax(itWarehouseBillsService.updateTWarehousebills(tWarehouseBills));
|
|
|
}
|
|
@@ -120,6 +149,7 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:remove')")
|
|
|
@Log(title = "详情主表", businessType = BusinessType.DELETE)
|
|
|
@DeleteMapping("/{fIds}")
|
|
|
+ @RepeatSubmit
|
|
|
public AjaxResult remove(@PathVariable Long[] fIds) {
|
|
|
return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
|
|
|
}
|
|
@@ -138,6 +168,7 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:revoke')")
|
|
|
@Log(title = "详情主表", businessType = BusinessType.UPDATE)
|
|
|
@GetMapping("/get/{fId}")
|
|
|
+ @RepeatSubmit
|
|
|
public AjaxResult revoke(@PathVariable("fId") Long fId) {
|
|
|
String billsType="SJCKRevoke";
|
|
|
// 获取当前的用户
|
|
@@ -151,6 +182,7 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
|
|
|
@Log(title = "详情主表", businessType = BusinessType.INSERT)
|
|
|
@PostMapping(value = "/updateCredit")
|
|
|
+ @RepeatSubmit
|
|
|
public AjaxResult deleteCredit(@RequestParam("warehouseBills") String warehouseBills,
|
|
|
@RequestParam("warehousebillsitems") String warehousebillsitems) {
|
|
|
String billsType = "SJCKRevoke";
|
|
@@ -201,6 +233,7 @@ public class TWarehouseOutStockController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")
|
|
|
@Log(title = "详情主表", businessType = BusinessType.INSERT)
|
|
|
@PostMapping(value = "/addCredit")
|
|
|
+ @RepeatSubmit
|
|
|
public AjaxResult addCredit(@RequestParam("warehouseBills") String warehouseBills,
|
|
|
@RequestParam("warehousebillsitems") String warehousebillsitems ) {
|
|
|
String billsType = "SJCK";
|