From adfce6c5a94c7aefa9b5d4f67e63db7eaac268d9 Mon Sep 17 00:00:00 2001
From: DESKTOP-LMJ82IJ\Eno <creaycat@gmail.com>
Date: 星期二, 07 一月 2025 20:29:31 +0800
Subject: [PATCH] #拣货单功能
---
/dev/null | 182 ------------------------------
zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetMapper.xml | 24 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheetDetl.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java | 12 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/PickSheetService.java | 8 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MatServiceImpl.java | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 2
zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetDetlMapper.xml | 31 +++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java | 14 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetDetlMapper.java | 12 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetMapper.java | 15 --
12 files changed, 102 insertions(+), 203 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
new file mode 100644
index 0000000..33d7a25
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.wms.asrs.controller;
+
+
+import com.zy.asrs.wms.system.controller.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/pick")
+@RestController
+public class PickSheetController extends BaseController {
+
+
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ManPickSheet.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java
similarity index 95%
rename from zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ManPickSheet.java
rename to zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java
index 4e193e7..1a46193 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ManPickSheet.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java
@@ -9,7 +9,7 @@
* man_pick_sheet
*/
@Data
-public class ManPickSheet implements Serializable {
+public class PickSheet implements Serializable {
/**
* 涓婚敭
*/
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ManPickSheetDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheetDetl.java
similarity index 96%
rename from zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ManPickSheetDetl.java
rename to zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheetDetl.java
index ac210fb..dd69932 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ManPickSheetDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheetDetl.java
@@ -9,7 +9,7 @@
* man_pick_sheet_detl
*/
@Data
-public class ManPickSheetDetl implements Serializable {
+public class PickSheetDetl implements Serializable {
/**
* 涓婚敭
*/
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index 29f8f7e..8d3b95f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -1122,6 +1122,8 @@
Map<Long, List<OrderOutMergeDto>> map = checkLoc(flatOrders, wave);
+
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetDetlMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetDetlMapper.java
index 46d65f3..5dd548f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetDetlMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetDetlMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wms.asrs.mapper;
-import com.zy.asrs.wms.asrs.entity.ManPickSheetDetl;
+import com.zy.asrs.wms.asrs.entity.PickSheetDetl;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -9,13 +9,13 @@
public interface ManPickSheetDetlMapper {
int deleteByPrimaryKey(Long id);
- int insert(ManPickSheetDetl record);
+ int insert(PickSheetDetl record);
- int insertSelective(ManPickSheetDetl record);
+ int insertSelective(PickSheetDetl record);
- ManPickSheetDetl selectByPrimaryKey(Long id);
+ PickSheetDetl selectByPrimaryKey(Long id);
- int updateByPrimaryKeySelective(ManPickSheetDetl record);
+ int updateByPrimaryKeySelective(PickSheetDetl record);
- int updateByPrimaryKey(ManPickSheetDetl record);
+ int updateByPrimaryKey(PickSheetDetl record);
}
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetMapper.java
index 6823002..a92a31c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ManPickSheetMapper.java
@@ -1,21 +1,12 @@
package com.zy.asrs.wms.asrs.mapper;
-import com.zy.asrs.wms.asrs.entity.ManPickSheet;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.asrs.wms.asrs.entity.PickSheet;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
-public interface ManPickSheetMapper {
- int deleteByPrimaryKey(Long id);
+public interface ManPickSheetMapper extends BaseMapper<PickSheet> {
- int insert(ManPickSheet record);
-
- int insertSelective(ManPickSheet record);
-
- ManPickSheet selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(ManPickSheet record);
-
- int updateByPrimaryKey(ManPickSheet record);
}
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/PickSheetService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/PickSheetService.java
new file mode 100644
index 0000000..59e5aba
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/PickSheetService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wms.asrs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.asrs.entity.PickSheet;
+
+public interface PickSheetService extends IService<PickSheet> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MatServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MatServiceImpl.java
index 8df03c5..7b21abb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MatServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MatServiceImpl.java
@@ -10,7 +10,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collections;
import java.util.List;
@Service("matService")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java
new file mode 100644
index 0000000..11d1800
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.wms.asrs.entity.PickSheet;
+import com.zy.asrs.wms.asrs.mapper.ManPickSheetMapper;
+import com.zy.asrs.wms.asrs.service.PickSheetService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PickSheetServiceImpl extends ServiceImpl<ManPickSheetMapper, PickSheet> implements PickSheetService {
+
+}
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/ManPickSheetDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/ManPickSheetDetlMapper.xml
deleted file mode 100644
index 784323a..0000000
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/ManPickSheetDetlMapper.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?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.zy.asrs.wms.asrs.mapper.ManPickSheetDetlMapper">
- <resultMap id="BaseResultMap" type="com.zy.asrs.wms.asrs.entity.ManPickSheetDetl">
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="pick_id" jdbcType="BIGINT" property="pickId" />
- <result column="order_id" jdbcType="BIGINT" property="orderId" />
- <result column="order_detl_id" jdbcType="BIGINT" property="orderDetlId" />
- <result column="mat_id" jdbcType="BIGINT" property="matId" />
- <result column="loc_id" jdbcType="BIGINT" property="locId" />
- <result column="maktx" jdbcType="VARCHAR" property="maktx" />
- <result column="matnr" jdbcType="VARCHAR" property="matnr" />
- <result column="batch" jdbcType="BIGINT" property="batch" />
- <result column="anfme" jdbcType="DECIMAL" property="anfme" />
- <result column="loc_no" jdbcType="VARCHAR" property="locNo" />
- <result column="barcode" jdbcType="VARCHAR" property="barcode" />
- <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
- <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
- <result column="host_id" jdbcType="BIGINT" property="hostId" />
- <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
- <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
- <result column="status" jdbcType="INTEGER" property="status" />
- <result column="deleted" jdbcType="INTEGER" property="deleted" />
- </resultMap>
- <sql id="Base_Column_List">
- id, pick_id, order_id, order_detl_id, mat_id, loc_id, maktx, matnr, batch, anfme,
- loc_no, barcode, created_time, updated_time, host_id, created_by, updated_by, `status`,
- deleted
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from man_pick_sheet_detl
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from man_pick_sheet_detl
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.zy.asrs.wms.asrs.entity.ManPickSheetDetl" useGeneratedKeys="true">
- insert into man_pick_sheet_detl (pick_id, order_id, order_detl_id,
- mat_id, loc_id, maktx,
- matnr, batch, anfme,
- loc_no, barcode, created_time,
- updated_time, host_id, created_by,
- updated_by, `status`, deleted
- )
- values (#{pickId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{orderDetlId,jdbcType=BIGINT},
- #{matId,jdbcType=BIGINT}, #{locId,jdbcType=BIGINT}, #{maktx,jdbcType=VARCHAR},
- #{matnr,jdbcType=VARCHAR}, #{batch,jdbcType=BIGINT}, #{anfme,jdbcType=DECIMAL},
- #{locNo,jdbcType=VARCHAR}, #{barcode,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP},
- #{updatedTime,jdbcType=TIMESTAMP}, #{hostId,jdbcType=BIGINT}, #{createdBy,jdbcType=VARCHAR},
- #{updatedBy,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{deleted,jdbcType=INTEGER}
- )
- </insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zy.asrs.wms.asrs.entity.ManPickSheetDetl" useGeneratedKeys="true">
- insert into man_pick_sheet_detl
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="pickId != null">
- pick_id,
- </if>
- <if test="orderId != null">
- order_id,
- </if>
- <if test="orderDetlId != null">
- order_detl_id,
- </if>
- <if test="matId != null">
- mat_id,
- </if>
- <if test="locId != null">
- loc_id,
- </if>
- <if test="maktx != null">
- maktx,
- </if>
- <if test="matnr != null">
- matnr,
- </if>
- <if test="batch != null">
- batch,
- </if>
- <if test="anfme != null">
- anfme,
- </if>
- <if test="locNo != null">
- loc_no,
- </if>
- <if test="barcode != null">
- barcode,
- </if>
- <if test="createdTime != null">
- created_time,
- </if>
- <if test="updatedTime != null">
- updated_time,
- </if>
- <if test="hostId != null">
- host_id,
- </if>
- <if test="createdBy != null">
- created_by,
- </if>
- <if test="updatedBy != null">
- updated_by,
- </if>
- <if test="status != null">
- `status`,
- </if>
- <if test="deleted != null">
- deleted,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="pickId != null">
- #{pickId,jdbcType=BIGINT},
- </if>
- <if test="orderId != null">
- #{orderId,jdbcType=BIGINT},
- </if>
- <if test="orderDetlId != null">
- #{orderDetlId,jdbcType=BIGINT},
- </if>
- <if test="matId != null">
- #{matId,jdbcType=BIGINT},
- </if>
- <if test="locId != null">
- #{locId,jdbcType=BIGINT},
- </if>
- <if test="maktx != null">
- #{maktx,jdbcType=VARCHAR},
- </if>
- <if test="matnr != null">
- #{matnr,jdbcType=VARCHAR},
- </if>
- <if test="batch != null">
- #{batch,jdbcType=BIGINT},
- </if>
- <if test="anfme != null">
- #{anfme,jdbcType=DECIMAL},
- </if>
- <if test="locNo != null">
- #{locNo,jdbcType=VARCHAR},
- </if>
- <if test="barcode != null">
- #{barcode,jdbcType=VARCHAR},
- </if>
- <if test="createdTime != null">
- #{createdTime,jdbcType=TIMESTAMP},
- </if>
- <if test="updatedTime != null">
- #{updatedTime,jdbcType=TIMESTAMP},
- </if>
- <if test="hostId != null">
- #{hostId,jdbcType=BIGINT},
- </if>
- <if test="createdBy != null">
- #{createdBy,jdbcType=VARCHAR},
- </if>
- <if test="updatedBy != null">
- #{updatedBy,jdbcType=VARCHAR},
- </if>
- <if test="status != null">
- #{status,jdbcType=INTEGER},
- </if>
- <if test="deleted != null">
- #{deleted,jdbcType=INTEGER},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.zy.asrs.wms.asrs.entity.ManPickSheetDetl">
- update man_pick_sheet_detl
- <set>
- <if test="pickId != null">
- pick_id = #{pickId,jdbcType=BIGINT},
- </if>
- <if test="orderId != null">
- order_id = #{orderId,jdbcType=BIGINT},
- </if>
- <if test="orderDetlId != null">
- order_detl_id = #{orderDetlId,jdbcType=BIGINT},
- </if>
- <if test="matId != null">
- mat_id = #{matId,jdbcType=BIGINT},
- </if>
- <if test="locId != null">
- loc_id = #{locId,jdbcType=BIGINT},
- </if>
- <if test="maktx != null">
- maktx = #{maktx,jdbcType=VARCHAR},
- </if>
- <if test="matnr != null">
- matnr = #{matnr,jdbcType=VARCHAR},
- </if>
- <if test="batch != null">
- batch = #{batch,jdbcType=BIGINT},
- </if>
- <if test="anfme != null">
- anfme = #{anfme,jdbcType=DECIMAL},
- </if>
- <if test="locNo != null">
- loc_no = #{locNo,jdbcType=VARCHAR},
- </if>
- <if test="barcode != null">
- barcode = #{barcode,jdbcType=VARCHAR},
- </if>
- <if test="createdTime != null">
- created_time = #{createdTime,jdbcType=TIMESTAMP},
- </if>
- <if test="updatedTime != null">
- updated_time = #{updatedTime,jdbcType=TIMESTAMP},
- </if>
- <if test="hostId != null">
- host_id = #{hostId,jdbcType=BIGINT},
- </if>
- <if test="createdBy != null">
- created_by = #{createdBy,jdbcType=VARCHAR},
- </if>
- <if test="updatedBy != null">
- updated_by = #{updatedBy,jdbcType=VARCHAR},
- </if>
- <if test="status != null">
- `status` = #{status,jdbcType=INTEGER},
- </if>
- <if test="deleted != null">
- deleted = #{deleted,jdbcType=INTEGER},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.zy.asrs.wms.asrs.entity.ManPickSheetDetl">
- update man_pick_sheet_detl
- set pick_id = #{pickId,jdbcType=BIGINT},
- order_id = #{orderId,jdbcType=BIGINT},
- order_detl_id = #{orderDetlId,jdbcType=BIGINT},
- mat_id = #{matId,jdbcType=BIGINT},
- loc_id = #{locId,jdbcType=BIGINT},
- maktx = #{maktx,jdbcType=VARCHAR},
- matnr = #{matnr,jdbcType=VARCHAR},
- batch = #{batch,jdbcType=BIGINT},
- anfme = #{anfme,jdbcType=DECIMAL},
- loc_no = #{locNo,jdbcType=VARCHAR},
- barcode = #{barcode,jdbcType=VARCHAR},
- created_time = #{createdTime,jdbcType=TIMESTAMP},
- updated_time = #{updatedTime,jdbcType=TIMESTAMP},
- host_id = #{hostId,jdbcType=BIGINT},
- created_by = #{createdBy,jdbcType=VARCHAR},
- updated_by = #{updatedBy,jdbcType=VARCHAR},
- `status` = #{status,jdbcType=INTEGER},
- deleted = #{deleted,jdbcType=INTEGER}
- where id = #{id,jdbcType=BIGINT}
- </update>
-</mapper>
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/ManPickSheetMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/ManPickSheetMapper.xml
deleted file mode 100644
index e6bd7f6..0000000
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/ManPickSheetMapper.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?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.zy.asrs.wms.asrs.mapper.ManPickSheetMapper">
- <resultMap id="BaseResultMap" type="com.zy.asrs.wms.asrs.entity.ManPickSheet">
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="pick_no" jdbcType="VARCHAR" property="pickNo" />
- <result column="wave_id" jdbcType="BIGINT" property="waveId" />
- <result column="wave_no" jdbcType="VARCHAR" property="waveNo" />
- <result column="anfme" jdbcType="DECIMAL" property="anfme" />
- <result column="memo" jdbcType="VARCHAR" property="memo" />
- <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
- <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
- <result column="host_id" jdbcType="BIGINT" property="hostId" />
- <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
- <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
- <result column="status" jdbcType="INTEGER" property="status" />
- <result column="deleted" jdbcType="INTEGER" property="deleted" />
- </resultMap>
- <sql id="Base_Column_List">
- id, pick_no, wave_id, wave_no, anfme, memo, created_time, updated_time, host_id,
- created_by, updated_by, `status`, deleted
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from man_pick_sheet
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from man_pick_sheet
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.zy.asrs.wms.asrs.entity.ManPickSheet" useGeneratedKeys="true">
- insert into man_pick_sheet (pick_no, wave_id, wave_no,
- anfme, memo, created_time,
- updated_time, host_id, created_by,
- updated_by, `status`, deleted
- )
- values (#{pickNo,jdbcType=VARCHAR}, #{waveId,jdbcType=BIGINT}, #{waveNo,jdbcType=VARCHAR},
- #{anfme,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP},
- #{updatedTime,jdbcType=TIMESTAMP}, #{hostId,jdbcType=BIGINT}, #{createdBy,jdbcType=VARCHAR},
- #{updatedBy,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{deleted,jdbcType=INTEGER}
- )
- </insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.zy.asrs.wms.asrs.entity.ManPickSheet" useGeneratedKeys="true">
- insert into man_pick_sheet
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="pickNo != null">
- pick_no,
- </if>
- <if test="waveId != null">
- wave_id,
- </if>
- <if test="waveNo != null">
- wave_no,
- </if>
- <if test="anfme != null">
- anfme,
- </if>
- <if test="memo != null">
- memo,
- </if>
- <if test="createdTime != null">
- created_time,
- </if>
- <if test="updatedTime != null">
- updated_time,
- </if>
- <if test="hostId != null">
- host_id,
- </if>
- <if test="createdBy != null">
- created_by,
- </if>
- <if test="updatedBy != null">
- updated_by,
- </if>
- <if test="status != null">
- `status`,
- </if>
- <if test="deleted != null">
- deleted,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="pickNo != null">
- #{pickNo,jdbcType=VARCHAR},
- </if>
- <if test="waveId != null">
- #{waveId,jdbcType=BIGINT},
- </if>
- <if test="waveNo != null">
- #{waveNo,jdbcType=VARCHAR},
- </if>
- <if test="anfme != null">
- #{anfme,jdbcType=DECIMAL},
- </if>
- <if test="memo != null">
- #{memo,jdbcType=VARCHAR},
- </if>
- <if test="createdTime != null">
- #{createdTime,jdbcType=TIMESTAMP},
- </if>
- <if test="updatedTime != null">
- #{updatedTime,jdbcType=TIMESTAMP},
- </if>
- <if test="hostId != null">
- #{hostId,jdbcType=BIGINT},
- </if>
- <if test="createdBy != null">
- #{createdBy,jdbcType=VARCHAR},
- </if>
- <if test="updatedBy != null">
- #{updatedBy,jdbcType=VARCHAR},
- </if>
- <if test="status != null">
- #{status,jdbcType=INTEGER},
- </if>
- <if test="deleted != null">
- #{deleted,jdbcType=INTEGER},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.zy.asrs.wms.asrs.entity.ManPickSheet">
- update man_pick_sheet
- <set>
- <if test="pickNo != null">
- pick_no = #{pickNo,jdbcType=VARCHAR},
- </if>
- <if test="waveId != null">
- wave_id = #{waveId,jdbcType=BIGINT},
- </if>
- <if test="waveNo != null">
- wave_no = #{waveNo,jdbcType=VARCHAR},
- </if>
- <if test="anfme != null">
- anfme = #{anfme,jdbcType=DECIMAL},
- </if>
- <if test="memo != null">
- memo = #{memo,jdbcType=VARCHAR},
- </if>
- <if test="createdTime != null">
- created_time = #{createdTime,jdbcType=TIMESTAMP},
- </if>
- <if test="updatedTime != null">
- updated_time = #{updatedTime,jdbcType=TIMESTAMP},
- </if>
- <if test="hostId != null">
- host_id = #{hostId,jdbcType=BIGINT},
- </if>
- <if test="createdBy != null">
- created_by = #{createdBy,jdbcType=VARCHAR},
- </if>
- <if test="updatedBy != null">
- updated_by = #{updatedBy,jdbcType=VARCHAR},
- </if>
- <if test="status != null">
- `status` = #{status,jdbcType=INTEGER},
- </if>
- <if test="deleted != null">
- deleted = #{deleted,jdbcType=INTEGER},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.zy.asrs.wms.asrs.entity.ManPickSheet">
- update man_pick_sheet
- set pick_no = #{pickNo,jdbcType=VARCHAR},
- wave_id = #{waveId,jdbcType=BIGINT},
- wave_no = #{waveNo,jdbcType=VARCHAR},
- anfme = #{anfme,jdbcType=DECIMAL},
- memo = #{memo,jdbcType=VARCHAR},
- created_time = #{createdTime,jdbcType=TIMESTAMP},
- updated_time = #{updatedTime,jdbcType=TIMESTAMP},
- host_id = #{hostId,jdbcType=BIGINT},
- created_by = #{createdBy,jdbcType=VARCHAR},
- updated_by = #{updatedBy,jdbcType=VARCHAR},
- `status` = #{status,jdbcType=INTEGER},
- deleted = #{deleted,jdbcType=INTEGER}
- where id = #{id,jdbcType=BIGINT}
- </update>
-</mapper>
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetDetlMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetDetlMapper.xml
new file mode 100644
index 0000000..1506ddd
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetDetlMapper.xml
@@ -0,0 +1,31 @@
+<?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.zy.asrs.wms.asrs.mapper.ManPickSheetDetlMapper">
+ <resultMap id="BaseResultMap" type="com.zy.asrs.wms.asrs.entity.PickSheetDetl">
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="pick_id" jdbcType="BIGINT" property="pickId" />
+ <result column="order_id" jdbcType="BIGINT" property="orderId" />
+ <result column="order_detl_id" jdbcType="BIGINT" property="orderDetlId" />
+ <result column="mat_id" jdbcType="BIGINT" property="matId" />
+ <result column="loc_id" jdbcType="BIGINT" property="locId" />
+ <result column="maktx" jdbcType="VARCHAR" property="maktx" />
+ <result column="matnr" jdbcType="VARCHAR" property="matnr" />
+ <result column="batch" jdbcType="BIGINT" property="batch" />
+ <result column="anfme" jdbcType="DECIMAL" property="anfme" />
+ <result column="loc_no" jdbcType="VARCHAR" property="locNo" />
+ <result column="barcode" jdbcType="VARCHAR" property="barcode" />
+ <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+ <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
+ <result column="host_id" jdbcType="BIGINT" property="hostId" />
+ <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
+ <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
+ <result column="status" jdbcType="INTEGER" property="status" />
+ <result column="deleted" jdbcType="INTEGER" property="deleted" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ id, pick_id, order_id, order_detl_id, mat_id, loc_id, maktx, matnr, batch, anfme,
+ loc_no, barcode, created_time, updated_time, host_id, created_by, updated_by, `status`,
+ deleted
+ </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetMapper.xml
new file mode 100644
index 0000000..c5d442c
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetMapper.xml
@@ -0,0 +1,24 @@
+<?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.zy.asrs.wms.asrs.mapper.ManPickSheetMapper">
+ <resultMap id="BaseResultMap" type="com.zy.asrs.wms.asrs.entity.PickSheet">
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="pick_no" jdbcType="VARCHAR" property="pickNo" />
+ <result column="wave_id" jdbcType="BIGINT" property="waveId" />
+ <result column="wave_no" jdbcType="VARCHAR" property="waveNo" />
+ <result column="anfme" jdbcType="DECIMAL" property="anfme" />
+ <result column="memo" jdbcType="VARCHAR" property="memo" />
+ <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
+ <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
+ <result column="host_id" jdbcType="BIGINT" property="hostId" />
+ <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
+ <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
+ <result column="status" jdbcType="INTEGER" property="status" />
+ <result column="deleted" jdbcType="INTEGER" property="deleted" />
+ </resultMap>
+ <sql id="Base_Column_List">
+ id, pick_no, wave_id, wave_no, anfme, memo, created_time, updated_time, host_id,
+ created_by, updated_by, `status`, deleted
+ </sql>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1