[CODE]: 调拨列表、新增、删除

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseTransferController.java

@@ -0,0 +1,136 @@
+package com.ruoyi.web.controller.warehouse.warehouseBusiness;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 仓储调拨Controller
+ *
+ * @author ruoyi
+ * @date 2020-12-28
+ */
+@RestController
+@RequestMapping("/warehouseBusiness/transfer")
+public class TWarehouseTransferController extends BaseController {
+    @Autowired
+    private ITWarehouseBillsService itWarehouseBillsService;
+
+    /**
+     * 查询调拨详情主表列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TWarehouseBills tWarehouseBills) {
+        startPage();
+        tWarehouseBills.setfBilltype("CKDB");
+        List<Map<String, Object>> list = itWarehouseBillsService.selectWarehouseBusinessList(tWarehouseBills);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询调拨详情主表列表
+     */
+    @GetMapping("/getWarehouseTransfer")
+    public String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills) {
+        return itWarehouseBillsService.getWarehouseInStockBillsNo(tWarehouseBills);
+    }
+
+
+    /**
+     * 导出调拨详情主表列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:export')")
+    @Log(title = "详情主表", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TWarehouseBills tWarehouseBills) {
+        List<TWarehouseBills> list = itWarehouseBillsService.selectTWarehousebillsList(tWarehouseBills);
+        ExcelUtil<TWarehouseBills> util = new ExcelUtil<TWarehouseBills>(TWarehouseBills.class);
+        return util.exportExcel(list, "warehousebills");
+    }
+
+    /**
+     * 获取调拨仓库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId) {
+        return AjaxResult.success(itWarehouseBillsService.selectTWarehousebillsById(fId));
+    }
+
+    /**
+     * 新增调拨详情主表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:add')")
+    @Log(title = "详情主表", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResult add(@RequestParam("tWarehouseBills") String tWarehouseBills,
+                          @RequestParam("tWhgenleg") String tWhgenleg,
+                          @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
+                          @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
+                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+        System.out.println("主表：" + tWarehouseBills);
+        System.out.println("附件：" + tWhgenleg);
+        System.out.println("付款：" + tWarehousebillsfeesCr);
+        System.out.println("收款：" + tWarehousebillsfeesDr);
+        System.out.println("明细：" + tWarehousebillsitems);
+        String billsType = "CKDB";
+        if (StringUtils.isEmpty(tWarehouseBills)) {
+            return AjaxResult.error("提交失败：请检查主表数据");
+        }
+        if (tWarehousebillsitems.equals("[]")) {
+            return AjaxResult.error("提交失败：请检查库存明细数据");
+        }
+        if (tWhgenleg.equals("[]")) {
+            return AjaxResult.error("提交失败：请检查附件信息");
+        }
+        if (tWarehousebillsfeesDr.equals("[]")) {
+            return AjaxResult.error("提交失败：请检查收款明细数据");
+        }
+        if (tWarehousebillsfeesCr.equals("[]")) {
+            return AjaxResult.error("提交失败：请检查付款明细数据");
+        }
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
+                tWarehousebillsfeesDr, tWarehousebillsitems, tWhgenleg, loginUser, billsType);
+    }
+
+    /**
+     * 修改调拨详情主表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:edit')")
+    @Log(title = "详情主表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TWarehouseBills tWarehouseBills) {
+        return toAjax(itWarehouseBillsService.updateTWarehousebills(tWarehouseBills));
+    }
+
+    /**
+     * 删除调拨详情主表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:transfer:remove')")
+    @Log(title = "详情主表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds) {
+        return toAjax(itWarehouseBillsService.deleteTWarehousebillsByIds(fIds));
+    }
+
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -286,8 +286,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWhgenleg.setfStatus("T");
         // 结余件数
         tWhgenleg.setfQtyblc(warehousebillsitems.getfQty());
-        // 出库数
-        tWhgenleg.setfQtyc(Long.parseLong("0"));
         System.out.println("主表新增：" + warehouseBills.toString());
         System.out.println("要添加的总账：" + tWhgenleg.toString());
         return tWhgenlegMapper.insertTWhgenleg(tWhgenleg);
@@ -374,6 +372,50 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             updateTWhgenlegData(wbItem, tWhgenle.getfId(), billsType);
                         }
                     }
+                } else if ("CKDB".equals(billsType)) { // 调拨查询
+                    if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存
+                        return AjaxResult.error("库存为空");
+                    } else { // 非空修改库存总账
+                        if ("6".equals(warehouseBills.getfBillstatus())) {
+                            if (tWhgenle.getfQtyblc() < wbItem.getfQty()) {  //  1、  库存 <  调拨件数  提示库存不足
+                                return AjaxResult.error("库存不足");
+                            } else {  // 2、 库存足够 先 进行出库操作
+                                updateTWhgenlegData(wbItem, tWhgenle.getfId(), "SJCK");
+                            }
+                            // 3、 进行入库操作 查询是否存在库存
+                            warehouseBills.setfCorpid(warehouseBills.getfTocorpid()); // 新货权方
+                            TWhgenleg tWhgenle1 = queryTWhgenleg(warehouseBills, wbItem);
+                            if (StringUtils.isNull(tWhgenle1)) {   // 5、 不存在 进行新增库存
+                                instalTWhgenleg(warehouseBills, wbItem, loginUser.getUser());
+                            } else { // 4、 存在 进行跟新库存
+                                if ("6".equals(warehouseBills.getfBillstatus())) {
+                                    updateTWhgenlegData(wbItem, tWhgenle1.getfId(), "SJRK");
+                                }
+                            }
+                        }
+                    }
+                }  else if ("HQZY".equals(billsType)) { // 货转
+                    if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存
+                        return AjaxResult.error("库存为空");
+                    } else { // 非空修改库存总账
+                        if ("6".equals(warehouseBills.getfBillstatus())) {
+                            if (tWhgenle.getfQtyblc() < wbItem.getfQty()) {  //  1、  库存 <  调拨件数  提示库存不足
+                                return AjaxResult.error("库存不足");
+                            } else {  // 2、 库存足够 先 进行出库操作
+                                updateTWhgenlegData(wbItem, tWhgenle.getfId(), "SJCK");
+                            }
+                            // 3、 进行入库操作 查询是否存在库存
+                            warehouseBills.setfCorpid(warehouseBills.getfTocorpid()); // 新货权方
+                            TWhgenleg tWhgenle1 = queryTWhgenleg(warehouseBills, wbItem);
+                            if (StringUtils.isNull(tWhgenle1)) {   // 5、 不存在 进行新增库存
+                                instalTWhgenleg(warehouseBills, wbItem, loginUser.getUser());
+                            } else { // 4、 存在 进行跟新库存
+                                if ("6".equals(warehouseBills.getfBillstatus())) {
+                                    updateTWhgenlegData(wbItem, tWhgenle.getfId(), "SJRK");
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }