Merge remote-tracking branch 'origin/master'

mjava-huagao/src/main/java/com/malk/huagao/entity/YdNonProdPrice.java

@@ -0,0 +1,47 @@
+package com.malk.huagao.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 非生产单价
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-07-24
+ */
+@Getter
+@Setter
+  @TableName("YD_NON_PROD_PRICE")
+public class YdNonProdPrice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      /**
+     * 工单类型
+     */
+      private String type;
+
+      /**
+     * 单据
+     */
+      private String form;
+
+      /**
+     * 仓位
+     */
+      private String position;
+
+      /**
+     * 物料编码前四位
+     */
+      private String materialCodeLeft;
+
+      /**
+     * 单价
+     */
+      private Object price;
+}

mjava-huagao/src/main/java/com/malk/huagao/entity/YdProdWorkHoursPrice.java

@@ -0,0 +1,32 @@
+package com.malk.huagao.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 生产工时单价
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-07-24
+ */
+@Getter
+@Setter
+  @TableName("YD_PROD_WORK_HOURS_PRICE")
+public class YdProdWorkHoursPrice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      /**
+     * 工单类型
+     */
+      private String type;
+
+      /**
+     * 单价
+     */
+      private Object price;
+}

mjava-huagao/src/main/java/com/malk/huagao/entity/YdUserInput.java

@@ -0,0 +1,55 @@
+package com.malk.huagao.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 人员工时投入
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-07-23
+ */
+@Getter
+@Setter
+  @TableName("YD_USER_INPUT")
+public class YdUserInput implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      /**
+     * 成员
+     */
+      private String user;
+
+      /**
+     * 员工id
+     */
+      private String userId;
+
+      /**
+     * 日期
+     */
+      private Date date;
+
+      /**
+     * 工时
+     */
+      private Object workHours;
+
+      /**
+     * 单价
+     */
+      private Object price;
+
+      /**
+     * 金额小计
+     */
+      private Object totalPrice;
+}

mjava-huagao/src/main/java/com/malk/huagao/mapper/YdNonProdPriceMapper.java

@@ -0,0 +1,23 @@
+package com.malk.huagao.mapper;
+
+import com.malk.huagao.entity.YdNonProdPrice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 非生产单价 Mapper 接口
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-07-24
+ */
+@Mapper
+public interface YdNonProdPriceMapper extends BaseMapper<YdNonProdPrice> {
+
+    List<YdNonProdPrice> selectByType(String type);
+
+}

mjava-huagao/src/main/java/com/malk/huagao/mapper/YdProdWorkHoursPriceMapper.java

@@ -0,0 +1,18 @@
+package com.malk.huagao.mapper;
+
+import com.malk.huagao.entity.YdProdWorkHoursPrice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 生产工时单价 Mapper 接口
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-07-24
+ */
+@Mapper
+public interface YdProdWorkHoursPriceMapper extends BaseMapper<YdProdWorkHoursPrice> {
+
+}

mjava-huagao/src/main/java/com/malk/huagao/mapper/YdUserInputMapper.java

@@ -0,0 +1,18 @@
+package com.malk.huagao.mapper;
+
+import com.malk.huagao.entity.YdUserInput;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 人员工时投入 Mapper 接口
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-07-23
+ */
+@Mapper
+public interface YdUserInputMapper extends BaseMapper<YdUserInput> {
+
+}

mjava-huagao/src/main/resources/mapper/YdNonProdPriceMapper.xml

@@ -0,0 +1,9 @@
+<?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="com.malk.huagao.mapper.YdNonProdPriceMapper">
+
+
+    <select id="selectByType" resultType="com.malk.huagao.entity.YdNonProdPrice">
+        select * from yd_non_prod_price where type = #{type}
+    </select>
+</mapper>

mjava-huagao/src/main/resources/mapper/YdProdWorkHoursPriceMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.malk.huagao.mapper.YdProdWorkHoursPriceMapper">
+
+</mapper>

mjava-huagao/src/main/resources/mapper/YdUserInputMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.malk.huagao.mapper.YdUserInputMapper">
+
+</mapper>