diff --git a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java index c9080cb..5e46d7d 100644 --- a/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java +++ b/ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java @@ -52,8 +52,6 @@ public class PdaApiController { @GetMapping("/getDefectDetail") public R< List> getDefectDetail(@NotBlank(message = "{defect.type.not.blank}") String defectType) { - - List defectDetail = iPdaApiService.getDefectDetail(defectType); if (defectDetail == null) { return R.fail(); diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java index 62061c4..98bd172 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java @@ -107,6 +107,25 @@ public class WmsPdaApiController extends BaseController { return result ? R.ok() : R.fail(); } + @PostMapping("/product/selectVehicle") + public R productBindSelectVehicle(String code) { + BaseToolingInfo baseToolingInfo = apiService.productBindSelectVehicle(code); + if (baseToolingInfo == null) { + return R.fail("查询失败,工装不正确"); + } + return R.ok(baseToolingInfo); + } + + @PostMapping("/product/selectTyreCode") + public R productBindSelectTyreCode(String code) { + TyreInfo tyreInfo = apiService.productBindSelectTyreCode(code); + if (tyreInfo == null) { + return R.fail("查询失败,工装不正确"); + } + return R.ok("查询成功",tyreInfo); + } + + /** * 成品跟载具绑定 * diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseToolingInfo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseToolingInfo.java new file mode 100644 index 0000000..7859bb8 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseToolingInfo.java @@ -0,0 +1,56 @@ +package org.dromara.wms.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 载具工装信息对象 base_tooling_info + * + * @author zangch + * @date 2025-01-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BaseToolingInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + + private Long toolingId; + + /** + * 工装编号 + */ + private String toolingCode; + + /** + * 工装名称 + */ + private String toolingName; + + + /** + * 工装条码 + */ + private String toolingBarcode; + + /** + * 工装RFID条码 + */ + private String toolingRfidBarcode; + + /** + * 物料编号 + */ + private String materialCode; + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/TyreInfo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/TyreInfo.java new file mode 100644 index 0000000..4e7ff1c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/TyreInfo.java @@ -0,0 +1,12 @@ +package org.dromara.wms.domain; + +import lombok.Data; + +@Data +public class TyreInfo { + + private String returnBarcode; + private Long materialId; + private String materialName; + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java index 7f56567..d693f35 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java @@ -49,4 +49,8 @@ public interface WmsPdaApiMapper { List slectMachineInfo(); + + BaseToolingInfo productBindSelectVehicle(@Param("code") String code); + + TyreInfo productBindSelectTyreCode(@Param("code") String code); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java index 34341d4..82053f0 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java @@ -58,4 +58,8 @@ public interface IWmsPdaApiService { Boolean seimMoveSubmit(Long id, String placeId); List slectMachineInfo(); + + BaseToolingInfo productBindSelectVehicle(String code); + + TyreInfo productBindSelectTyreCode(String code); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java index 9cf43c2..0579d60 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java @@ -373,4 +373,14 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { public List slectMachineInfo() { return apiMapper.slectMachineInfo(); } + + @Override + public BaseToolingInfo productBindSelectVehicle(String code) { + return apiMapper.productBindSelectVehicle(code); + } + + @Override + public TyreInfo productBindSelectTyreCode(String code) { + return apiMapper.productBindSelectTyreCode(code); + } } diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml index 0a787d2..8d475a8 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml @@ -1,24 +1,27 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - update wms_outstock_record set return_flag= '1' where outstock_record_id=#{warehouseId} + update wms_outstock_record + set return_flag= '1' + where outstock_record_id = #{warehouseId} - + INSERT INTO wms_psm_in_load (tooling_barcode, material_id, material_spe, check_grade_code, - load_amount, material_code) + load_amount, material_code) VALUES (#{wmsPsmInLoad.toolingBarcode}, null, null, null, #{wmsPsmInLoad.loadAmount}, null); INSERT INTO wms_psm_in_load_detail (in_load_id, material_id, - material_spe, tyre_no, check_grade_code) + material_spe, tyre_no, check_grade_code) VALUES ( #{id}, null, null,#{item}, null) @@ -43,26 +46,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" load_amount, material_code FROM wms_psm_in_load - WHERE tooling_barcode = #{code} AND store_place_code IS NULL + WHERE tooling_barcode = #{code} + AND store_place_code IS NULL ORDER BY create_time DESC - + INSERT INTO wms_psm_in_stock_detail (in_stock_id, material_id, material_spe, tyre_no, check_grade_code) VALUES - - (#{id}, #{item.materialId}, #{item.materialSpe}, #{item.tyreNo},#{item.checkGradeCode} ) - + + (#{id}, #{item.materialId}, #{item.materialSpe}, #{item.tyreNo},#{item.checkGradeCode} ) + INSERT INTO wms_psm_storage (create_by, material_id, material_spe, tyre_no, check_grade_code, store_name, - store_place_code, tooling_barcode) + store_place_code, tooling_barcode) VALUES - - (#{data.createBy}, #{item.materialId}, #{item.materialSpe}, #{item.tyreNo},#{item.checkGradeCode},#{data.storeName}, - #{data.storePlaceCode},#{data.toolingBarcode}) + + (#{data.createBy}, #{item.materialId}, #{item.materialSpe}, + #{item.tyreNo},#{item.checkGradeCode},#{data.storeName}, + #{data.storePlaceCode},#{data.toolingBarcode}) @@ -70,8 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - INSERT INTO prod_shift_change (shift_id, class_team_id, user_id, user_name,shift_change_time,create_by,create_time) - VALUES (#{shiftId}, #{classTeamId}, #{userId}, #{userName},getdate(), #{userId},getdate()); + INSERT INTO prod_shift_change (shift_id, class_team_id, user_id, user_name, shift_change_time, create_by, + create_time) + VALUES (#{shiftId}, #{classTeamId}, #{userId}, #{userName}, getdate(), #{userId}, getdate()); @@ -79,10 +85,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -90,14 +98,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select whsd.store_place_code + from wms_hpp_storage_detail whsd + left join wms_hpp_store_place wsp on wsp.store_place_code = whsd.store_place_code + where wsp.store_id = #{storeId} + group by whsd.store_place_code @@ -109,4 +121,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from prod_base_machine_info + + + + + + + + + + + + + + + +