Merge remote-tracking branch 'origin/dev' into dev

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsMaterialTransferBillsController.java

@@ -0,0 +1,116 @@
+package org.dromara.wms.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo;
+import org.dromara.wms.domain.bo.WmsMaterialTransferBillsBo;
+import org.dromara.wms.service.IWmsMaterialTransferBillsService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 物料调拨单
+ * 前端访问路由地址为:/wms/materialTransferBills
+ *
+ * @author Yinq
+ * @date 2025-12-08
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/materialTransferBills")
+public class WmsMaterialTransferBillsController extends BaseController {
+
+    private final IWmsMaterialTransferBillsService wmsMaterialTransferBillsService;
+
+    /**
+     * 查询物料调拨单列表
+     */
+    @SaCheckPermission("wms:materialTransferBills:list")
+    @GetMapping("/list")
+    public TableDataInfo<WmsMaterialTransferBillsVo> list(WmsMaterialTransferBillsBo bo, PageQuery pageQuery) {
+        return wmsMaterialTransferBillsService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出物料调拨单列表
+     */
+    @SaCheckPermission("wms:materialTransferBills:export")
+    @Log(title = "物料调拨单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(WmsMaterialTransferBillsBo bo, HttpServletResponse response) {
+        List<WmsMaterialTransferBillsVo> list = wmsMaterialTransferBillsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "物料调拨单", WmsMaterialTransferBillsVo.class, response);
+    }
+
+    /**
+     * 获取物料调拨单详细信息
+     *
+     * @param transferBillsId 主键
+     */
+    @SaCheckPermission("wms:materialTransferBills:query")
+    @GetMapping("/{transferBillsId}")
+    public R<WmsMaterialTransferBillsVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("transferBillsId") Long transferBillsId) {
+        return R.ok(wmsMaterialTransferBillsService.queryById(transferBillsId));
+    }
+
+    /**
+     * 新增物料调拨单
+     */
+    @SaCheckPermission("wms:materialTransferBills:add")
+    @Log(title = "物料调拨单", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsMaterialTransferBillsBo bo) {
+        return toAjax(wmsMaterialTransferBillsService.insertByBo(bo));
+    }
+
+    /**
+     * 修改物料调拨单
+     */
+    @SaCheckPermission("wms:materialTransferBills:edit")
+    @Log(title = "物料调拨单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsMaterialTransferBillsBo bo) {
+        return toAjax(wmsMaterialTransferBillsService.updateByBo(bo));
+    }
+
+    /**
+     * 删除物料调拨单
+     *
+     * @param transferBillsIds 主键串
+     */
+    @SaCheckPermission("wms:materialTransferBills:remove")
+    @Log(title = "物料调拨单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{transferBillsIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("transferBillsIds") Long[] transferBillsIds) {
+        return toAjax(wmsMaterialTransferBillsService.deleteWithValidByIds(List.of(transferBillsIds), true));
+    }
+
+    /**
+     * 下拉框查询物料调拨单列表
+     */
+    @GetMapping("/getWmsMaterialTransferBillsList")
+    public R<List<WmsMaterialTransferBillsVo>> getWmsMaterialTransferBillsList(WmsMaterialTransferBillsBo bo) {
+        List<WmsMaterialTransferBillsVo> list = wmsMaterialTransferBillsService.queryList(bo);
+        return R.ok(list);
+    }
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsMaterialTransferRecordController.java

@@ -78,7 +78,7 @@ public class WmsMaterialTransferRecordController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody List<WmsMaterialTransferRecord> bo) {
-        return toAjax(wmsMaterialTransferRecordService.insertByBo(bo));
+        return toAjax(wmsMaterialTransferRecordService.insertByBo(null,bo));
     }
 
     /**

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/SysUser.java

@@ -0,0 +1,108 @@
+package org.dromara.wms.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_user")
+public class SysUser extends TenantEntity {
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id")
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别
+     */
+    private String sex;
+
+    /**
+     * 用户头像
+     */
+    private Long avatar;
+
+    /**
+     * 密码
+     */
+    @TableField(
+        insertStrategy = FieldStrategy.NOT_EMPTY,
+        updateStrategy = FieldStrategy.NOT_EMPTY,
+        whereStrategy = FieldStrategy.NOT_EMPTY
+    )
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private Date loginDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java

@@ -77,5 +77,10 @@ public class WmsBaseProduct extends TenantEntity {
      */
     private String unitName;
 
+    @TableField(exist = false)
+    private String createByName;
+    @TableField(exist = false)
+    private String updateByName;
+
 
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsMaterialTransferBills.java

@@ -0,0 +1,62 @@
+package org.dromara.wms.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 物料调拨单对象 wms_material_transfer_bills
+ *
+ * @author Yinq
+ * @date 2025-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("wms_material_transfer_bills")
+public class WmsMaterialTransferBills extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 调拨记录ID
+     */
+    @TableId(value = "transfer_bills_id", type = IdType.AUTO)
+    private Long transferBillsId;
+
+    /**
+     * 调拨单号
+     */
+    private String transferBillsCode;
+
+    /**
+     * 调出仓库
+     */
+    private Long transferOutStoreId;
+
+    /**
+     * 调入仓库
+     */
+    private Long transferInStoreId;
+
+    /**
+     * 状态
+     */
+    private String billsStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsMaterialTransferRecord.java

@@ -56,12 +56,14 @@ public class WmsMaterialTransferRecord extends TenantEntity {
      * 调入仓库
      */
     private Long transferInStoreId;
-
+    /**
+     * 调拨单ID
+     */
+    private Long transferBillsId;
     /**
      * 库存id
      */
     private Long inventoryDetailsId;
-
     /**
      * 删除标志（0代表存在 1代表删除）
      */
@@ -72,7 +74,6 @@ public class WmsMaterialTransferRecord extends TenantEntity {
      */
     @TableField(exist = false)
     private String productCode;
-
     /**
      * 成品名称
      */
@@ -81,9 +82,10 @@ public class WmsMaterialTransferRecord extends TenantEntity {
     @TableField(exist = false)
     private String externalBrand;
     @TableField(exist = false)
-    /**
-     * 成品描述
-     */
     private String productSpe;
 
+    @TableField(exist = false)
+    private Double unitPrice;
+    @TableField(exist = false)
+    private Long projectId;
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsSampleDisposalRecord.java

@@ -81,4 +81,5 @@ public class WmsSampleDisposalRecord extends TenantEntity {
      */
     @TableField(exist = false)
     private String productSpe;
+
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsSampleLedger.java

@@ -125,6 +125,7 @@ public class WmsSampleLedger extends TenantEntity {
      */
     private String projectCode;
 
+
     @TableField(exist = false)
     /**
      * 项目名称

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsMaterialTransferBillsBo.java

@@ -0,0 +1,58 @@
+package org.dromara.wms.domain.bo;
+
+import org.dromara.wms.domain.WmsMaterialTransferBills;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.wms.domain.WmsMaterialTransferRecord;
+
+import java.util.List;
+
+/**
+ * 物料调拨单业务对象 wms_material_transfer_bills
+ *
+ * @author Yinq
+ * @date 2025-12-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WmsMaterialTransferBills.class, reverseConvertGenerate = false)
+public class WmsMaterialTransferBillsBo extends BaseEntity {
+
+    /**
+     * 调拨记录ID
+     */
+    @NotNull(message = "调拨记录ID不能为空", groups = { EditGroup.class })
+    private Long transferBillsId;
+
+    /**
+     * 调拨单号
+     */
+    private String transferBillsCode;
+
+    /**
+     * 调出仓库
+     */
+    private Long transferOutStoreId;
+
+    /**
+     * 调入仓库
+     */
+    private Long transferInStoreId;
+
+    /**
+     * 状态
+     */
+    private String billsStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    List<WmsMaterialTransferRecord> list;
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsMaterialTransferRecordBo.java

@@ -72,6 +72,6 @@ public class WmsMaterialTransferRecordBo extends BaseEntity {
      * 成品描述
      */
     private String productSpe;
-
+    private Long transferBillsId;
 
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsSampleDisposalRecordBo.java

@@ -55,8 +55,9 @@ public class WmsSampleDisposalRecordBo extends BaseEntity {
      * 样品台账ID
      */
     private Long sampleLedgerId;
+    private Long warehouseId;
 
-
+    private Long inventoryDetailsId;
 
 
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java

@@ -124,5 +124,6 @@ public class WmsBaseProductVo implements Serializable {
      * 计量单位名称
      */
     private String unitName;
-
+    private String createByName;
+    private String updateByName;
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsMaterialTransferBillsVo.java

@@ -0,0 +1,111 @@
+package org.dromara.wms.domain.vo;
+
+import org.dromara.wms.domain.WmsMaterialTransferBills;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 物料调拨单视图对象 wms_material_transfer_bills
+ *
+ * @author Yinq
+ * @date 2025-12-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = WmsMaterialTransferBills.class)
+public class WmsMaterialTransferBillsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 调拨记录ID
+     */
+    @ExcelProperty(value = "调拨记录ID")
+    private Long transferBillsId;
+
+    /**
+     * 调拨单号
+     */
+    @ExcelProperty(value = "调拨单号")
+    private String transferBillsCode;
+
+    /**
+     * 调出仓库
+     */
+    @ExcelProperty(value = "调出仓库")
+    private Long transferOutStoreId;
+
+    /**
+     * 调入仓库
+     */
+    @ExcelProperty(value = "调入仓库")
+    private Long transferInStoreId;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private String billsStatus;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=代表存在,1=代表删除")
+    private String delFlag;
+
+    /**
+     * 创建部门
+     */
+    @ExcelProperty(value = "创建部门")
+    private Long createDept;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @ExcelProperty(value = "更新人")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/SysUserMapper.java

@@ -0,0 +1,7 @@
+package org.dromara.wms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.wms.domain.SysUser;
+
+public interface SysUserMapper extends BaseMapper<SysUser> {
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java

@@ -1,9 +1,7 @@
 package org.dromara.wms.mapper;
 
-import java.util.List;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.Date;
+
 import org.apache.ibatis.annotations.Param;
 import org.dromara.wms.domain.WmsInventoryDetails;
 import org.dromara.wms.domain.vo.WmsInventoryDetailsVo;
@@ -20,6 +18,17 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WmsInventoryDetailsMapper extends BaseMapperPlus<WmsInventoryDetails, WmsInventoryDetailsVo> {
 
-    int updataDetailsByInventoryId(WmsInventoryDetails inventoryDetails);
+    int updataDetailsByInventoryId(@Param("inventoryDetailsId") Long inventoryDetailsId,
+                                   @Param("outStockAmount") Double outStockAmount,
+                                   @Param("nowDate") Date nowDate,
+                                   @Param("userId") Long userId,
+                                   @Param("delFlag") String delFlag);
 
+
+    int workAddUpdateInventory(WmsInventoryDetails inventoryDetails);
+
+    void updateTableById(@Param("inventoryDetailsId") Long inventoryDetailsId,
+                         @Param("inStockAmount") Double inStockAmount,
+                         @Param("nowDate") Date nowDate,
+                         @Param("userId") Long userId);
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsMaterialTransferBillsMapper.java

@@ -0,0 +1,37 @@
+package org.dromara.wms.mapper;
+
+import java.util.List;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.wms.domain.WmsMaterialTransferBills;
+import org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 物料调拨单Mapper接口
+ *
+ * @author Yinq
+ * @date 2025-12-08
+ */
+public interface WmsMaterialTransferBillsMapper extends BaseMapperPlus<WmsMaterialTransferBills, WmsMaterialTransferBillsVo> {
+
+    /**
+     * 查询物料调拨单列表
+     *
+     * @param page         分页
+     * @param queryWrapper 条件
+     * @return 物料调拨单集合
+     */
+    public Page<WmsMaterialTransferBillsVo> selectCustomWmsMaterialTransferBillsVoList(@Param("page") Page<WmsMaterialTransferBillsVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsMaterialTransferBills> queryWrapper);
+
+    /**
+     * 查询物料调拨单列表
+     *
+     * @param queryWrapper 条件
+     * @return 物料调拨单集合
+     */
+    public List<WmsMaterialTransferBillsVo> selectCustomWmsMaterialTransferBillsVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsMaterialTransferBills> queryWrapper);
+
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsSampleDisposalRecordMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import org.dromara.wms.domain.WmsSampleDisposalRecord;
 import org.dromara.wms.domain.vo.WmsSampleDisposalRecordVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 样品处置记录Mapper接口
@@ -15,6 +16,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author Yinq
  * @date 2025-11-21
  */
+@Repository
 public interface WmsSampleDisposalRecordMapper extends BaseMapperPlus<WmsSampleDisposalRecord, WmsSampleDisposalRecordVo> {
 
     /**

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsInventoryDetailsService.java

@@ -72,5 +72,12 @@ public interface IWmsInventoryDetailsService {
 
     WmsInventoryDetails queryInventory(WmsInventoryDetailsBo inventory);
 
-    Double workUpdateInventory(Long inventoryDetailsId, Double disposalQty);
+
+    WmsInventoryDetails selectDetailsById(Long sampleLedgerId);
+
+    Boolean workAddUpdateInventory(WmsInventoryDetails inventoryDetails);
+
+    Boolean inStoreAddInventoryAmount(Long warehouseId, Long projectId, String batchNumber, Long materialId, Double unitPrice, String unitName, Double inStockAmount,String changeType);
+
+    Boolean outStoreLossInventoryAmount(Long inventoryId, Double outStockAmount, Long warehouseId, String batchNumber, Long materielId, String changeType);
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsMaterialTransferBillsService.java

@@ -0,0 +1,69 @@
+package org.dromara.wms.service;
+
+import org.dromara.wms.domain.WmsMaterialTransferBills;
+import org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo;
+import org.dromara.wms.domain.bo.WmsMaterialTransferBillsBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 物料调拨单Service接口
+ *
+ * @author Yinq
+ * @date 2025-12-08
+ */
+public interface IWmsMaterialTransferBillsService {
+
+    /**
+     * 查询物料调拨单
+     *
+     * @param transferBillsId 主键
+     * @return 物料调拨单
+     */
+    WmsMaterialTransferBillsVo queryById(Long transferBillsId);
+
+    /**
+     * 分页查询物料调拨单列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 物料调拨单分页列表
+     */
+    TableDataInfo<WmsMaterialTransferBillsVo> queryPageList(WmsMaterialTransferBillsBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的物料调拨单列表
+     *
+     * @param bo 查询条件
+     * @return 物料调拨单列表
+     */
+    List<WmsMaterialTransferBillsVo> queryList(WmsMaterialTransferBillsBo bo);
+
+    /**
+     * 新增物料调拨单
+     *
+     * @param bo 物料调拨单
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(WmsMaterialTransferBillsBo bo);
+
+    /**
+     * 修改物料调拨单
+     *
+     * @param bo 物料调拨单
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(WmsMaterialTransferBillsBo bo);
+
+    /**
+     * 校验并批量删除物料调拨单信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsMaterialTransferRecordService.java

@@ -48,7 +48,7 @@ public interface IWmsMaterialTransferRecordService {
      * @param bo 物料调拨
      * @return 是否新增成功
      */
-    Boolean insertByBo(List<WmsMaterialTransferRecord> bo);
+    Boolean insertByBo(Long transferBillsId,List<WmsMaterialTransferRecord> bo);
 
     /**
      * 修改物料调拨

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java

@@ -8,7 +8,9 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.wms.domain.BaseUnitInfo;
+import org.dromara.wms.domain.SysUser;
 import org.dromara.wms.domain.WmsBaseProduct;
 import org.dromara.wms.domain.bo.WmsBaseProductBo;
 import org.dromara.wms.domain.vo.WmsBaseProductVo;
@@ -76,7 +78,14 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService {
             .eq(StringUtils.isNotBlank(bo.getProductCode()), WmsBaseProduct::getProductCode, bo.getProductCode())
             .like(StringUtils.isNotBlank(bo.getProductName()), WmsBaseProduct::getProductName, bo.getProductName())
             .like(StringUtils.isNotBlank(bo.getExternalBrand()), WmsBaseProduct::getExternalBrand, bo.getExternalBrand())
-            .eq(StringUtils.isNotBlank(bo.getActiveFlag()), WmsBaseProduct::getActiveFlag, bo.getActiveFlag());
+            .eq(StringUtils.isNotBlank(bo.getActiveFlag()), WmsBaseProduct::getActiveFlag, bo.getActiveFlag())
+            .leftJoin(SysUser.class, SysUser::getUserId, WmsBaseProduct::getCreateBy)
+            .selectAs(SysUser::getNickName, WmsBaseProduct::getCreateByName)
+            .leftJoin(SysUser.class, SysUser::getUserId, WmsBaseProduct::getUpdateBy)
+            .selectAs(SysUser::getNickName, WmsBaseProduct::getUpdateByName)
+            ;
+
+
     }
 
     /**
@@ -88,6 +97,8 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService {
     @Override
     public Boolean insertByBo(WmsBaseProductBo bo) {
         WmsBaseProduct add = MapstructUtils.convert(bo, WmsBaseProduct.class);
+
+        // add.setCreateByName(LoginHelper.getUsername());
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setProductId(add.getProductId());
@@ -104,6 +115,7 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService {
     @Override
     public Boolean updateByBo(WmsBaseProductBo bo) {
         WmsBaseProduct update = MapstructUtils.convert(bo, WmsBaseProduct.class);
+        // update.setUpdateByName(LoginHelper.getUsername());
         return baseMapper.updateById(update) > 0;
     }
 

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInStockBillServiceImpl.java

@@ -26,6 +26,7 @@ import org.dromara.wms.service.IWmsInventoryDetailsService;
 import org.dromara.workflow.api.RemoteWorkflowService;
 import org.dromara.workflow.api.domain.RemoteStartProcess;
 import org.dromara.workflow.api.event.ProcessEvent;
+import org.springframework.beans.factory.parsing.BeanEntry;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
@@ -45,7 +46,6 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService {
     private final WmsInStockDetailsMapper wmsInStockDetailsMapper;
     private final IWmsInventoryDetailsService inventoryService;
     // private final IWmsWarehouseInfoService warehouseService;
-    private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper;
     @DubboReference
     private RemoteCodeRuleService remoteCodeRuleService;
     @DubboReference(timeout = 30000)//超时时间
@@ -113,7 +113,6 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService {
     @Override
     public Boolean insertByBo(WmsInStockBillBo bo) {
         WmsInStockBill add = MapstructUtils.convert(bo, WmsInStockBill.class);
-        String inStockType = add.getInStockType();
         add.setInStockCode(remoteCodeRuleService.selectCodeRuleCode("1005"));// 物料入库编码
         add.setInStockBillStatus("3");
         boolean flag = baseMapper.insert(add) > 0;//插入主表
@@ -125,45 +124,17 @@ public class WmsInStockBillServiceImpl implements IWmsInStockBillService {
             inStockDetailsList.forEach(item -> {
                 item.setInStockBillId(inStockBillId);  // 设置入库单明细的入库单ID
                 item.setProjectId(projectId);  // 关联项目
-                Double inStockAmount = item.getInStockAmount();
-                Double inventoryTableAmount = 0.0;// 库存表数量
                 // 构建库存明细
-                WmsInventoryDetailsBo inventory = new WmsInventoryDetailsBo();
-                inventory.setWarehouseId(item.getWarehouseId());
-                inventory.setProjectId(projectId);
-                inventory.setBatchNumber(item.getBatchNumber());
-                inventory.setMaterielId(item.getMaterialId());
-                inventory.setUnitPrice(item.getUnitPrice());
-                // 查询相同项目 相同仓库 相同批次 相同单价的物料
-                WmsInventoryDetails queryInventory = inventoryService.queryInventory(inventory);
-                if (queryInventory != null) {
-                    WmsInventoryDetailsBo inventoryUpdate = new WmsInventoryDetailsBo();
-                    inventoryUpdate.setInventoryDetailsId(queryInventory.getInventoryDetailsId());
-                    inventoryTableAmount = queryInventory.getInventoryAmount() ;
-                    inventoryUpdate.setInventoryAmount(inventoryTableAmount+ inStockAmount);
-                    inventoryService.updateByBo(inventoryUpdate); // 更新库存数量
-                } else {
-
-                    inventory.setUnitName(item.getUnitName());
-                    inventory.setInventoryAmount(inStockAmount);
-                    inventory.setStartInventoryAmount(inStockAmount); // 初始库存数量
-                    inventoryService.insertByBo(inventory);
-                }
-
-
-                //库存变动
-                WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger();
-                wmsInventoryLedger.setWarehouseId(item.getWarehouseId());
-                wmsInventoryLedger.setBatchNumber(item.getBatchNumber());
-                wmsInventoryLedger.setMaterielId(item.getMaterialId());
-                wmsInventoryLedger.setChangeType(inStockType);//变动类型
-                wmsInventoryLedger.setLedgerState("1");
-                wmsInventoryLedger.setChangeAmount(inStockAmount);
-                wmsInventoryLedger.setInventoryAmount(inventoryTableAmount);
-                wmsInventoryLedgers.add(wmsInventoryLedger);
+                inventoryService.inStoreAddInventoryAmount(
+                    item.getWarehouseId(),
+                    projectId,
+                    item.getBatchNumber(),
+                    item.getMaterialId(),
+                    item.getUnitPrice(),
+                    item.getUnitName(),
+                    item.getInStockAmount(),add.getInStockType());
             });
             wmsInStockDetailsMapper.insert(inStockDetailsList); //插入子表
-            wmsInventoryLedgerMapper.insert(wmsInventoryLedgers);
         }
         return flag;
     }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryDetailsServiceImpl.java

@@ -12,10 +12,12 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.wms.domain.WmsBaseProduct;
 import org.dromara.wms.domain.WmsInventoryDetails;
+import org.dromara.wms.domain.WmsInventoryLedger;
 import org.dromara.wms.domain.WmsWarehouseInfo;
 import org.dromara.wms.domain.bo.WmsInventoryDetailsBo;
 import org.dromara.wms.domain.vo.WmsInventoryDetailsVo;
 import org.dromara.wms.mapper.WmsInventoryDetailsMapper;
+import org.dromara.wms.mapper.WmsInventoryLedgerMapper;
 import org.dromara.wms.service.IWmsInventoryDetailsService;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +35,7 @@ import java.util.List;
 public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsService {
 
     private final WmsInventoryDetailsMapper baseMapper;
+    private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper;
 
     /**
      * 查询库存明细
@@ -96,7 +99,6 @@ public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsServi
         return baseMapper.selectVoList(lqw);
     }
 
-
     private MPJLambdaWrapper<WmsInventoryDetails> buildQueryWrapper(WmsInventoryDetailsBo bo) {
         // Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<WmsInventoryDetails> lqw = JoinWrappers.lambda(WmsInventoryDetails.class)
@@ -148,7 +150,6 @@ public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsServi
         return baseMapper.updateById(update) > 0;
     }
 
-
     /**
      * 校验并批量删除库存明细信息
      *
@@ -162,10 +163,78 @@ public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsServi
     }
 
 
+    @Override
+    public WmsInventoryDetails selectDetailsById(Long sampleLedgerId) {
+        MPJLambdaWrapper<WmsInventoryDetails> lqw = JoinWrappers.lambda(WmsInventoryDetails.class)
+            .selectAll(WmsInventoryDetails.class)
+            .eq(WmsInventoryDetails::getInventoryDetailsId, sampleLedgerId);
+
+        return baseMapper.selectOne(lqw);
+    }
+
+    @Override
+    public Boolean workAddUpdateInventory(WmsInventoryDetails inventoryDetails) {
+        return baseMapper.workAddUpdateInventory(inventoryDetails) > 0;
+    }
+
+    /**
+     * 新增或更新库存明细
+     *
+     * @param warehouseId   仓库ID
+     * @param projectId     项目ID
+     * @param batchNumber   批次号
+     * @param materialId    物料ID
+     * @param unitPrice     单价
+     * @param unitName      单位
+     * @param inStockAmount 入库数量
+     * @return 是否新增或更新成功
+     */
+
+    @Override
+    public Boolean inStoreAddInventoryAmount(Long warehouseId, Long projectId, String batchNumber, Long materialId,
+                                             Double unitPrice, String unitName, Double inStockAmount, String changeType) {
+        WmsInventoryDetailsBo inventory = new WmsInventoryDetailsBo();
+        inventory.setWarehouseId(warehouseId);
+        inventory.setProjectId(projectId);
+        inventory.setBatchNumber(batchNumber);
+        inventory.setMaterielId(materialId);
+        inventory.setUnitPrice(unitPrice);
+        // 查询相同项目 相同仓库 相同批次 相同单价的物料
+        WmsInventoryDetails queryInventory = queryInventory(inventory);
+        Double inventoryTableAmount = 0.0;
+        if (queryInventory != null) {
+            inventoryTableAmount = queryInventory.getInventoryAmount();
+            baseMapper.updateTableById(queryInventory.getInventoryDetailsId(), inStockAmount, DateUtils.getNowDate(), LoginHelper.getUserId()); // update增加库存数量
+        } else {
+            inventory.setUnitName(unitName);
+            inventory.setInventoryAmount(inStockAmount);
+            inventory.setStartInventoryAmount(inStockAmount);
+            this.insertByBo(inventory);
+        }
+        //库存变动
+        WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger();
+        wmsInventoryLedger.setWarehouseId(warehouseId);
+        wmsInventoryLedger.setBatchNumber(batchNumber);
+        wmsInventoryLedger.setMaterielId(materialId);
+        wmsInventoryLedger.setChangeType(changeType);//变动类型
+        wmsInventoryLedger.setLedgerState("1");
+        wmsInventoryLedger.setChangeAmount(inStockAmount);
+        wmsInventoryLedger.setInventoryAmount(inventoryTableAmount);
+        wmsInventoryLedgerMapper.insert(wmsInventoryLedger);
+        return true;
+    }
+
+    /**
+     * 查询符合条件的库存明细
+     *
+     * @param bo 查询条件
+     * @return 库存明细
+     */
     @Override
     public WmsInventoryDetails queryInventory(WmsInventoryDetailsBo bo) {
         MPJLambdaWrapper<WmsInventoryDetails> lqw = JoinWrappers.lambda(WmsInventoryDetails.class)
             .selectAll(WmsInventoryDetails.class)
+            // .eq(WmsInventoryDetails::getDelFlag, "0")
             .eq(StringUtils.isNotBlank(bo.getLocationCode()), WmsInventoryDetails::getLocationCode, bo.getLocationCode())
             .eq(bo.getWarehouseId() != null, WmsInventoryDetails::getWarehouseId, bo.getWarehouseId())
             .eq(bo.getMaterielId() != null, WmsInventoryDetails::getMaterielId, bo.getMaterielId())
@@ -177,22 +246,26 @@ public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsServi
     }
 
     @Override
-    public Double workUpdateInventory(Long inventoryDetailsId, Double disposalQty) {
-
-        WmsInventoryDetails inventory = baseMapper.selectById(inventoryDetailsId);
+    public Boolean outStoreLossInventoryAmount(Long inventoryId, Double outStockAmount, Long warehouseId,
+                                               String batchNumber, Long materielId, String changeType) {
+        WmsInventoryDetails inventory = baseMapper.selectById(inventoryId);
         Double inventoryAmount = inventory.getInventoryAmount();
-        double lossQty = inventoryAmount - disposalQty;
+        double lossQty = inventoryAmount - outStockAmount;
         if (lossQty < 0) {
             throw new IllegalArgumentException("库存数量不足");
         }
 
-        inventory.setInventoryAmount(lossQty);
-        if (lossQty == 0.0) {
-            inventory.setDelFlag("1");
-        }
-        inventory.setUpdateBy(LoginHelper.getUserId());
-        inventory.setUpdateTime(DateUtils.getNowDate());
-        baseMapper.updataDetailsByInventoryId(inventory);
-        return inventoryAmount;
+        baseMapper.updataDetailsByInventoryId(inventoryId, outStockAmount, DateUtils.getNowDate(), LoginHelper.getUserId(), lossQty == 0.0 ? "1" : "0");
+        //库存变动
+        WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger();
+        wmsInventoryLedger.setWarehouseId(warehouseId);
+        wmsInventoryLedger.setBatchNumber(batchNumber);
+        wmsInventoryLedger.setMaterielId(materielId);
+        wmsInventoryLedger.setChangeType(changeType);//变动类型
+        wmsInventoryLedger.setLedgerState("0");
+        wmsInventoryLedger.setChangeAmount(outStockAmount);
+        wmsInventoryLedger.setInventoryAmount(inventoryAmount);
+        wmsInventoryLedgerMapper.insert(wmsInventoryLedger);
+        return true;
     }
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferBillsServiceImpl.java

@@ -0,0 +1,148 @@
+package org.dromara.wms.service.impl;
+
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+    import org.dromara.common.mybatis.core.page.TableDataInfo;
+    import org.dromara.common.mybatis.core.page.PageQuery;
+    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.system.api.RemoteCodeRuleService;
+import org.dromara.wms.service.IWmsMaterialTransferRecordService;
+import org.springframework.stereotype.Service;
+import org.dromara.wms.domain.bo.WmsMaterialTransferBillsBo;
+import org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo;
+import org.dromara.wms.domain.WmsMaterialTransferBills;
+import org.dromara.wms.mapper.WmsMaterialTransferBillsMapper;
+import org.dromara.wms.service.IWmsMaterialTransferBillsService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 物料调拨单Service业务层处理
+ *
+ * @author Yinq
+ * @date 2025-12-08
+ */
+@RequiredArgsConstructor
+@Service
+public class WmsMaterialTransferBillsServiceImpl implements IWmsMaterialTransferBillsService {
+
+    private final WmsMaterialTransferBillsMapper baseMapper;
+
+    /**
+     * 查询物料调拨单
+     *
+     * @param transferBillsId 主键
+     * @return 物料调拨单
+     */
+    @Override
+    public WmsMaterialTransferBillsVo queryById(Long transferBillsId){
+        return baseMapper.selectVoById(transferBillsId);
+    }
+
+        /**
+         * 分页查询物料调拨单列表
+         *
+         * @param bo        查询条件
+         * @param pageQuery 分页参数
+         * @return 物料调拨单分页列表
+         */
+        @Override
+        public TableDataInfo<WmsMaterialTransferBillsVo> queryPageList(WmsMaterialTransferBillsBo bo, PageQuery pageQuery) {
+            MPJLambdaWrapper<WmsMaterialTransferBills> lqw = buildQueryWrapper(bo);
+            Page<WmsMaterialTransferBillsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+            return TableDataInfo.build(result);
+        }
+
+    /**
+     * 查询符合条件的物料调拨单列表
+     *
+     * @param bo 查询条件
+     * @return 物料调拨单列表
+     */
+    @Override
+    public List<WmsMaterialTransferBillsVo> queryList(WmsMaterialTransferBillsBo bo) {
+        MPJLambdaWrapper<WmsMaterialTransferBills> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private MPJLambdaWrapper<WmsMaterialTransferBills> buildQueryWrapper(WmsMaterialTransferBillsBo bo) {
+        Map<String, Object> params = bo.getParams();
+        MPJLambdaWrapper<WmsMaterialTransferBills> lqw = JoinWrappers.lambda(WmsMaterialTransferBills.class)
+        .selectAll(WmsMaterialTransferBills.class)
+        .eq(WmsMaterialTransferBills::getDelFlag, "0")
+                    .eq(bo.getTransferOutStoreId() != null, WmsMaterialTransferBills::getTransferOutStoreId, bo.getTransferOutStoreId())
+                    .eq(bo.getTransferInStoreId() != null, WmsMaterialTransferBills::getTransferInStoreId, bo.getTransferInStoreId())
+                    .eq(StringUtils.isNotBlank(bo.getBillsStatus()), WmsMaterialTransferBills::getBillsStatus, bo.getBillsStatus())
+                    .between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
+                    WmsMaterialTransferBills::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime"))
+;
+        return lqw;
+    }
+    @DubboReference
+    private RemoteCodeRuleService remoteCodeRuleService;
+    private final IWmsMaterialTransferRecordService wmsMaterialTransferRecordService;
+    /**
+     * 新增物料调拨单
+     *
+     * @param bo 物料调拨单
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(WmsMaterialTransferBillsBo bo) {
+        WmsMaterialTransferBills add = MapstructUtils.convert(bo, WmsMaterialTransferBills.class);
+        add.setTransferBillsCode(remoteCodeRuleService.selectCodeRuleCode("wms_1003"));
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            Long transferBillsId = add.getTransferBillsId();
+            bo.setTransferBillsId(transferBillsId);
+            //插入子表
+            wmsMaterialTransferRecordService.insertByBo(transferBillsId,bo.getList());
+
+
+        }
+        return flag;
+    }
+
+    /**
+     * 修改物料调拨单
+     *
+     * @param bo 物料调拨单
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(WmsMaterialTransferBillsBo bo) {
+        WmsMaterialTransferBills update = MapstructUtils.convert(bo, WmsMaterialTransferBills.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(WmsMaterialTransferBills entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除物料调拨单信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsMaterialTransferRecordServiceImpl.java

@@ -9,12 +9,11 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.wms.domain.WmsBaseProduct;
-import org.dromara.wms.domain.WmsInventoryDetails;
 import org.dromara.wms.domain.WmsMaterialTransferRecord;
 import org.dromara.wms.domain.bo.WmsMaterialTransferRecordBo;
 import org.dromara.wms.domain.vo.WmsMaterialTransferRecordVo;
-import org.dromara.wms.mapper.WmsInventoryDetailsMapper;
 import org.dromara.wms.mapper.WmsMaterialTransferRecordMapper;
+import org.dromara.wms.service.IWmsInventoryDetailsService;
 import org.dromara.wms.service.IWmsMaterialTransferRecordService;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +33,9 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe
 
     private final WmsMaterialTransferRecordMapper baseMapper;
 
-    private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper;
+    // private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper;
+    private final IWmsInventoryDetailsService wmsInventoryDetailsService;
+
     /**
      * 查询物料调拨
      *
@@ -77,6 +78,7 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe
         MPJLambdaWrapper<WmsMaterialTransferRecord> lqw = JoinWrappers.lambda(WmsMaterialTransferRecord.class)
             .selectAll(WmsMaterialTransferRecord.class)
             .eq(WmsMaterialTransferRecord::getDelFlag, "0")
+            .eq(bo.getTransferBillsId() != null, WmsMaterialTransferRecord::getTransferBillsId, bo.getTransferBillsId())
             .eq(bo.getMaterielId() != null, WmsMaterialTransferRecord::getMaterielId, bo.getMaterielId())
             .eq(StringUtils.isNotBlank(bo.getBatchNumber()), WmsMaterialTransferRecord::getBatchNumber, bo.getBatchNumber())
             .eq(bo.getTransferOutStoreId() != null, WmsMaterialTransferRecord::getTransferOutStoreId, bo.getTransferOutStoreId())
@@ -95,16 +97,30 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertByBo(List<WmsMaterialTransferRecord> bo) {
-        baseMapper.insert(bo);
+    public Boolean insertByBo(Long transferBillsId, List<WmsMaterialTransferRecord> bo) {
+
         // 修改库存
         bo.forEach(record -> {
-            // Long transferOutStoreId = record.getTransferOutStoreId();
-
-            Long inventoryDetailsId = record.getInventoryDetailsId(); // 库存ID
+            record.setTransferBillsId(transferBillsId);// 调拨单ID
+            Long inventoryId = record.getInventoryDetailsId(); // 库存ID
             Double transferQty = record.getTransferQty(); // 调拨数量
-            // 库存验证
-            WmsInventoryDetails inventoryDetails = wmsInventoryDetailsMapper.selectById( inventoryDetailsId);
+            wmsInventoryDetailsService.outStoreLossInventoryAmount(
+                inventoryId,
+                transferQty,
+                record.getTransferOutStoreId(),
+                record.getBatchNumber(),
+                record.getMaterielId(), "6");
+            wmsInventoryDetailsService.inStoreAddInventoryAmount(
+                 record.getTransferInStoreId(),
+                record.getProjectId(),
+                record.getBatchNumber(),
+                record.getMaterielId(),
+                record.getUnitPrice(),
+                record.getUnitName(),
+                transferQty, "7");
+
+           /* // 库存验证
+            WmsInventoryDetails inventoryDetails = wmsInventoryDetailsMapper.selectById(inventoryDetailsId);
             double lossQty = inventoryDetails.getInventoryAmount() - transferQty;
             if (lossQty < 0) {
                 throw new IllegalArgumentException("库存不足");
@@ -116,22 +132,21 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe
             if (lossQty == 0) {
                 outDetails.setDelFlag("1");
             }
-            wmsInventoryDetailsMapper.updateById(outDetails);
+            // wmsInventoryDetailsMapper.updateById(outDetails);
+
+
             // 入库库存增加
             WmsInventoryDetails inDetails = new WmsInventoryDetails();
             inDetails.setInventoryAmount(transferQty);// 入库数量
-            inDetails.setWarehouseId(record.getTransferInStoreId()); //仓库
-            inDetails.setInventoryDetailsId(null);
+            inDetails.setWarehouseId(record.getTransferInStoreId()); //仓库id
             inDetails.setMaterielId(inventoryDetails.getMaterielId());
             inDetails.setUnitPrice(inventoryDetails.getUnitPrice());
-
-            wmsInventoryDetailsMapper.insert(inDetails);
-
-
-
-
+            inDetails.setBatchNumber(record.getBatchNumber());
+            inDetails.setUnitName(record.getUnitName());*/
+            // inDetails
+            // wmsInventoryDetailsMapper.insert(inDetails);
         });
-
+        baseMapper.insert(bo);
         return true;
     }
 
@@ -148,7 +163,6 @@ public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransfe
     }
 
 
-
     /**
      * 校验并批量删除物料调拨信息
      *

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockBillServiceImpl.java

@@ -22,6 +22,7 @@ import org.dromara.wms.mapper.WmsInventoryDetailsMapper;
 import org.dromara.wms.mapper.WmsInventoryLedgerMapper;
 import org.dromara.wms.mapper.WmsOutStockBillMapper;
 import org.dromara.wms.mapper.WmsOutStockDetailsMapper;
+import org.dromara.wms.service.IWmsInventoryDetailsService;
 import org.dromara.wms.service.IWmsOutStockBillService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,8 +45,7 @@ public class WmsOutStockBillServiceImpl implements IWmsOutStockBillService {
 
     private final WmsOutStockBillMapper baseMapper;
     private final WmsOutStockDetailsMapper wmsOutStockDetailsMapper;
-    private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper;
-    private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper;
+    private final IWmsInventoryDetailsService inventoryDetailsService;
     @DubboReference
     private RemoteCodeRuleService remoteCodeRuleService;
 
@@ -123,35 +123,12 @@ public class WmsOutStockBillServiceImpl implements IWmsOutStockBillService {
                 item.setOutStockBillId(outStockBillId);
                 // 从出库明细中获取库存ID
                 Long inventoryId = item.getInventoryDetailsId();
-                WmsInventoryDetails inventory = wmsInventoryDetailsMapper.selectById(inventoryId);
-                Double inventoryAmount = inventory.getInventoryAmount();
-                double lossQty = inventoryAmount - item.getOutStockAmount();
-                if (lossQty < 0) {
-                    throw new IllegalArgumentException("库存数量不足");
-                }
-
-                inventory.setInventoryAmount(lossQty);
-                if (lossQty == 0.0){
-                    inventory.setDelFlag("1");
-                }
-                inventory.setUpdateBy( LoginHelper.getUserId());
-                inventory.setUpdateTime(DateUtils.getNowDate());
-                wmsInventoryDetailsMapper.updataDetailsByInventoryId(inventory);
-                //库存变动
-                WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger();
-                wmsInventoryLedger.setWarehouseId(item.getWarehouseId());
-                wmsInventoryLedger.setBatchNumber(item.getBatchNumber());
-                wmsInventoryLedger.setMaterielId(item.getMaterielId());
-                wmsInventoryLedger.setChangeType("3");//变动类型
-                wmsInventoryLedger.setLedgerState("0");
-                wmsInventoryLedger.setChangeAmount(item.getOutStockAmount());
-                wmsInventoryLedger.setInventoryAmount(inventoryAmount);
-                wmsInventoryLedgers.add(wmsInventoryLedger);
+                inventoryDetailsService.outStoreLossInventoryAmount(inventoryId,
+                    item.getOutStockAmount(),item.getWarehouseId(),item.getBatchNumber(),item.getMaterielId(),"3");
             });
             //插入出库明细
             wmsOutStockDetailsMapper.insert(outStockDetailsList);
-            //插入库存变动
-            wmsInventoryLedgerMapper.insert(wmsInventoryLedgers);
+
         }
         return flag;
     }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsSampleDisposalRecordServiceImpl.java

@@ -4,15 +4,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.wms.domain.WmsBaseProduct;
+import org.dromara.wms.domain.WmsInventoryDetails;
+import org.dromara.wms.domain.WmsInventoryLedger;
 import org.dromara.wms.domain.WmsSampleDisposalRecord;
 import org.dromara.wms.domain.bo.WmsSampleDisposalRecordBo;
 import org.dromara.wms.domain.vo.WmsSampleDisposalRecordVo;
+import org.dromara.wms.mapper.WmsInventoryLedgerMapper;
 import org.dromara.wms.mapper.WmsSampleDisposalRecordMapper;
+import org.dromara.wms.service.IWmsInventoryDetailsService;
 import org.dromara.wms.service.IWmsSampleDisposalRecordService;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +37,8 @@ import java.util.Map;
 public class WmsSampleDisposalRecordServiceImpl implements IWmsSampleDisposalRecordService {
 
     private final WmsSampleDisposalRecordMapper baseMapper;
+    private final IWmsInventoryDetailsService inventoryDetailsService;
+    private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper;
 
     /**
      * 查询样品处置记录
@@ -91,10 +99,34 @@ public class WmsSampleDisposalRecordServiceImpl implements IWmsSampleDisposalRec
     @Override
     public Boolean insertByBo(WmsSampleDisposalRecordBo bo) {
         WmsSampleDisposalRecord add = MapstructUtils.convert(bo, WmsSampleDisposalRecord.class);
-        validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
-            bo.setSampleRecordId(add.getSampleRecordId());
+            // bo.setSampleRecordId(add.getSampleRecordId());
+            if (add.getDisposalType().equals("0")) {
+                WmsInventoryDetails inventoryDetails = inventoryDetailsService.selectDetailsById(bo.getInventoryDetailsId());
+                Double inventoryAmount = 0.0;
+                if (inventoryDetails != null) {//不直接操作数据库的情况下都有库存详情
+                    inventoryAmount = inventoryDetails.getInventoryAmount();
+                    inventoryDetails.setInventoryAmount(inventoryAmount + bo.getDisposalQty());
+                    inventoryDetails.setUpdateBy(LoginHelper.getUserId());
+                    inventoryDetails.setUpdateTime(DateUtils.getNowDate());
+                    inventoryDetailsService.workAddUpdateInventory(inventoryDetails);
+                }else {
+
+                }
+
+
+                //库存变动
+                WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger();
+                wmsInventoryLedger.setWarehouseId(bo.getWarehouseId());
+                wmsInventoryLedger.setBatchNumber(bo.getBatchNumber());
+                wmsInventoryLedger.setMaterielId(bo.getMaterielId());
+                wmsInventoryLedger.setChangeType("5");//变动类型
+                wmsInventoryLedger.setLedgerState("1");
+                wmsInventoryLedger.setChangeAmount(bo.getDisposalQty());
+                wmsInventoryLedger.setInventoryAmount(inventoryAmount);
+                wmsInventoryLedgerMapper.insert(wmsInventoryLedger);
+            }
         }
         return flag;
     }
@@ -108,16 +140,9 @@ public class WmsSampleDisposalRecordServiceImpl implements IWmsSampleDisposalRec
     @Override
     public Boolean updateByBo(WmsSampleDisposalRecordBo bo) {
         WmsSampleDisposalRecord update = MapstructUtils.convert(bo, WmsSampleDisposalRecord.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(WmsSampleDisposalRecord entity) {
-        //TODO 做一些数据校验,如唯一约束
-    }
 
     /**
      * 校验并批量删除样品处置记录信息
@@ -128,9 +153,7 @@ public class WmsSampleDisposalRecordServiceImpl implements IWmsSampleDisposalRec
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
+
         return baseMapper.deleteByIds(ids) > 0;
     }
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsSampleLedgerServiceImpl.java

@@ -35,7 +35,6 @@ public class WmsSampleLedgerServiceImpl implements IWmsSampleLedgerService {
 
     private final WmsSampleLedgerMapper baseMapper;
     private final IWmsInventoryDetailsService inventoryDetailsService;
-    private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper;
 
     /**
      * 查询样品管理
@@ -104,24 +103,10 @@ public class WmsSampleLedgerServiceImpl implements IWmsSampleLedgerService {
      */
     @Override
     public Boolean insertByBo(List<WmsSampleLedger> bo) {
-        List<WmsInventoryLedger> wmsInventoryLedgers = new ArrayList<>(bo.size());
         bo.forEach(item -> {
-            Long inventoryId = item.getInventoryDetailsId();
-            Double lentQty = item.getLentQty();
-            Double inventoryAmount = inventoryDetailsService.workUpdateInventory(inventoryId, lentQty);
-            //库存变动
-            WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger();
-            wmsInventoryLedger.setWarehouseId(item.getWarehouseId());
-            wmsInventoryLedger.setBatchNumber(item.getBatchNumber());
-            wmsInventoryLedger.setMaterielId(item.getMaterielId());
-            wmsInventoryLedger.setChangeType("4");//变动类型
-            wmsInventoryLedger.setLedgerState("0");
-            wmsInventoryLedger.setChangeAmount(lentQty);
-            wmsInventoryLedger.setInventoryAmount(inventoryAmount);
-            wmsInventoryLedgers.add(wmsInventoryLedger);
+            inventoryDetailsService.outStoreLossInventoryAmount(item.getInventoryDetailsId(),
+                item.getLentQty(),item.getWarehouseId(),item.getBatchNumber(),item.getMaterielId(),"4");
         });
-
-        wmsInventoryLedgerMapper.insert(wmsInventoryLedgers);
         baseMapper.insert(bo);
         return true;
     }
@@ -139,6 +124,7 @@ public class WmsSampleLedgerServiceImpl implements IWmsSampleLedgerService {
         double obj = bo.getReturnQty() - disposalQty;
         update.setReturnQty(obj);
         update.setSampleState(obj == 0 ? "2" : "1");
+
         return baseMapper.updateById(update) > 0;
     }
 

ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsInventoryDetailsMapper.xml

@@ -7,14 +7,32 @@
     </resultMap>
 
 
-    <update id="updataDetailsByInventoryId" parameterType="org.dromara.wms.domain.WmsInventoryDetails">
+    <update id="updataDetailsByInventoryId" >
         update wms_inventory_details
-        <set>
-            <if test="inventoryAmount != null">inventory_amount = #{inventoryAmount},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </set>
+        set inventory_amount = inventory_amount - #{outStockAmount},
+            del_flag         = #{delFlag},
+            update_by        = #{userId},
+            update_time      = #{nowDate}
+            where inventory_details_id = #{inventoryDetailsId}
+    </update>
+
+
+    <update id="workAddUpdateInventory" parameterType="org.dromara.wms.domain.WmsInventoryDetails">
+        update wms_inventory_details
+        set inventory_amount = #{inventoryAmount},
+            del_flag         =0,
+            update_by        = #{updateBy},
+            update_time      = #{updateTime}
+        where inventory_details_id = #{inventoryDetailsId}
+
+    </update>
+
+    <update id="updateTableById">
+        update wms_inventory_details
+        set inventory_amount = inventory_amount + #{inStockAmount},
+            del_flag         =0,
+            update_by        = #{userId},
+            update_time      = #{nowDate}
         where inventory_details_id = #{inventoryDetailsId}
     </update>
 

ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsMaterialTransferBillsMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.wms.mapper.WmsMaterialTransferBillsMapper">
+    <resultMap type="org.dromara.wms.domain.vo.WmsMaterialTransferBillsVo" id="WmsMaterialTransferBillsResult">
+    </resultMap>
+
+    <select id="selectCustomWmsMaterialTransferBillsVoList" resultMap="WmsMaterialTransferBillsResult">
+        select transfer_bills_id, transfer_bills_code, transfer_out_store_id, transfer_in_store_id, bills_status, remark, tenant_id, del_flag, create_dept, create_by, create_time, update_by, update_time from wms_material_transfer_bills t
+            ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>