zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/PickSheetController.java
New file @@ -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 { } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheet.java
File was renamed from zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ManPickSheet.java @@ -9,7 +9,7 @@ * man_pick_sheet */ @Data public class ManPickSheet implements Serializable { public class PickSheet implements Serializable { /** * 主键 */ zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/PickSheetDetl.java
File was renamed from zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ManPickSheetDetl.java @@ -9,7 +9,7 @@ * man_pick_sheet_detl */ @Data public class ManPickSheetDetl implements Serializable { public class PickSheetDetl implements Serializable { /** * 主键 */ 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); }
@@ -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); } 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); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/PickSheetService.java
New file @@ -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> { } 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") zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java
New file @@ -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 { } zy-asrs-wms/src/main/resources/mapper/asrs/ManPickSheetDetlMapper.xml
File was deleted zy-asrs-wms/src/main/resources/mapper/asrs/ManPickSheetMapper.xml
File was deleted zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetDetlMapper.xml
New file @@ -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> zy-asrs-wms/src/main/resources/mapper/asrs/PickSheetMapper.xml
New file @@ -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>
