xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://1.13.177.47:3000/xins/hwmom

Browse Source
master
yinq 1 month ago
parent 04b96458b7 755c783440
commit 3929fb9613
9 changed files with 131 additions and 24 deletions
Show Stats Download Patch File Download Diff File

4
pom.xml
Unescape Escape View File

@ -71,10 +71,10 @@
<profiles>
<profile>
<id>devw</id>
<id>dev</id>
<properties>
<!-- 环境标识，需要与配置文件的名称相对应 -->
<profiles.active>devw</profiles.active>
<profiles.active>dev</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>

4
ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java
Unescape Escape View File

@ -1,8 +1,9 @@
package org.dromara.qms.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.qms.domain.QcDefectDetail;
import org.dromara.qms.domain.vo.QcDefectDetailVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.springframework.stereotype.Repository;
/**
* 病疵详细Mapper接口
@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author LionLi
* @date 2025-01-10
*/
@Repository
public interface QcDefectDetailMapper extends BaseMapperPlus<QcDefectDetail, QcDefectDetailVo> {
}

4
ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java
Unescape Escape View File

@ -1,8 +1,9 @@
package org.dromara.qms.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.qms.domain.QcDefectInfo;
import org.dromara.qms.domain.vo.QcDefectInfoVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.springframework.stereotype.Repository;
/**
* 病疵信息Mapper接口
@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author LionLi
* @date 2025-01-10
*/
@Repository
public interface QcDefectInfoMapper extends BaseMapperPlus<QcDefectInfo, QcDefectInfoVo> {
}

18
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java
Unescape Escape View File

@ -183,7 +183,7 @@ public class WmsPdaApiController extends BaseController {
public R<WmsHppInStockDetailVo> semiSelectVehicleInfo(String code) {
WmsHppInStockDetailVo wmsHppInStockDetailVo = apiService.semiSelectVehicleInfo(code);
if (wmsHppInStockDetailVo == null) {
return R.fail("载具没有绑定物料，或者载具编码扫描错误");
return R.fail("流转卡号扫描错误");
}
return R.ok(wmsHppInStockDetailVo);
}
@ -317,10 +317,24 @@ public class WmsPdaApiController extends BaseController {
return result ? R.ok() : R.fail();
}
/**
* 查询机台
* @return
*/
@PostMapping("/selectMachineInfo")
public R<List<BaseMachineInfo>> slectMachineInfo() {
List<BaseMachineInfo> list = apiService.slectMachineInfo();
return R.ok(list);
}
/**
* 查询机台工位
* @return prod_base_station_info
*/
@PostMapping("/selectMachineStationList")
public R<List<String>> selectMachineStationList(Long machineId) {
List<String> list = apiService.selectMachineStationList(machineId);
return list == null ? R.fail() : R.ok(list);
}
}

61
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java
Unescape Escape View File

@ -0,0 +1,61 @@
package org.dromara.wms.controller.api;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.encrypt.annotation.ApiEncrypt;
import org.dromara.common.web.core.BaseController;
import org.dromara.wms.domain.vo.WmsHppInStockDetailVo;
import org.dromara.wms.domain.vo.WmsHppStorePlaceVo;
import org.dromara.wms.domain.vo.WmsInventoryVo;
import org.dromara.wms.service.IWmsHppStorePlaceService;
import org.dromara.wms.service.IWmsPdaApiService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RequiredArgsConstructor
@RestController
@RequestMapping("/machineApi")
public class MachineApiController extends BaseController {
private final IWmsPdaApiService apiService;
private final IWmsHppStorePlaceService wmsHppStorePlaceService;
/**
* 半成品入库提交
*
* @param vo xinx
*/
@ApiEncrypt
@PostMapping("/semi/submitInstore")
public R<Void> semiSubmitInStoreInfo(@RequestBody WmsHppInStockDetailVo vo) {
// 验证库位条码
WmsHppStorePlaceVo wmsPsmStorePlace = wmsHppStorePlaceService.selectStorePlaceInfoByCode(vo.getStorePlaceCode());
if (wmsPsmStorePlace == null) {
return R.fail("库位编码扫描错误");
}
vo.setStorePlaceId(wmsPsmStorePlace.getObjId());
Boolean result = apiService.updataInStoreRecord(vo);
return result ? R.ok() : R.fail();
}
// 根据库位查询库存
@PostMapping("/storeCheck/selectInventory")
public R<List<WmsInventoryVo>> storeCheckSelectInventory(String locationCode, String type) {
List<WmsInventoryVo> list = apiService.storeCheckSelectInventory(locationCode, type);
if (list == null || list.isEmpty()) {
return R.fail();
}
return R.ok(list);
}
}

7
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppInStockDetail.java
Unescape Escape View File

@ -1,9 +1,9 @@
package org.dromara.wms.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.math.BigDecimal;
@ -95,5 +95,6 @@ public class WmsHppInStockDetail{
@TableField(exist = false)
private String storePlaceCode;
private String unitName;
}

9
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppInStockDetailMapper.java
Unescape Escape View File

@ -1,6 +1,5 @@
package org.dromara.wms.mapper;
import org.apache.ibatis.annotations.Select;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wms.domain.WmsHppInStockDetail;
import org.dromara.wms.domain.vo.WmsHppInStockDetailVo;
@ -14,9 +13,9 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface WmsHppInStockDetailMapper extends BaseMapperPlus<WmsHppInStockDetail, WmsHppInStockDetailVo> {
@Select("select top 1 obj_id,create_time,card_no,shelf_no, grade_code,product_category,\n" +
" material_id,material_spec,instock_num,material_code,unit_name\n" +
"from wms_hpp_in_stock_detail where store_place_id is null and shelf_no=#{code}\n" +
"order by create_time")
// @Select("select top 1 obj_id,create_time,card_no,shelf_no, grade_code,product_category,\n" +
// " material_id,material_spec,instock_num,material_code,unit_name\n" +
// "from wms_hpp_in_stock_detail where store_place_id is null and shelf_no=#{code}\n" +
// "order by create_time")
WmsHppInStockDetailVo semiSelectVehicleInfo(String code);
}

21
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java
Unescape Escape View File

@ -8,6 +8,7 @@ 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.satoken.utils.LoginHelper;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.wms.domain.*;
@ -26,7 +27,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
private final WmsOutstockRecordMapper wmsOutstockRecordMapper;
private final WmsPdaApiMapper apiMapper;
private final WmsHppInStockDetailMapper baseMapper;
private final WmsPsmInStockMapper wmsPsmInStockMapper;
private final WmsPsmInLoadDetailMapper wmsPsmInLoadDetailMapper;
private final WmsInventoryCheckRecordMapper wmsInventoryCheckRecordMapper;
@ -105,17 +106,21 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
@Override
public WmsHppInStockDetailVo semiSelectVehicleInfo(String code) {
return baseMapper.semiSelectVehicleInfo(code);
return hppInStockDetailMapper.semiSelectVehicleInfo(code);
}
@Override
public Boolean updataInStoreRecord(WmsHppInStockDetailVo vo) {
LambdaUpdateWrapper<WmsHppInStockDetail> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(WmsHppInStockDetail::getObjId, vo.getObjId())
.set(WmsHppInStockDetail::getStorePlaceId, vo.getStorePlaceId())
.set(WmsHppInStockDetail::getUpdateTime, DateUtils.getTime())
.set(WmsHppInStockDetail::getUpdateBy, LoginHelper.getUsername());
int rows = hppInStockDetailMapper.update(null, lambdaUpdateWrapper);
// LambdaUpdateWrapper<WmsHppInStockDetail> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
// lambdaUpdateWrapper.eq(WmsHppInStockDetail::getObjId, vo.getObjId())
// .set(WmsHppInStockDetail::getStorePlaceId, vo.getStorePlaceId())
// .set(WmsHppInStockDetail::getUpdateTime, DateUtils.getTime())
// .set(WmsHppInStockDetail::getUpdateBy, LoginHelper.getUsername());
// int rows = hppInStockDetailMapper.update(null, lambdaUpdateWrapper);
WmsHppInStockDetail convert = MapstructUtils.convert(vo, WmsHppInStockDetail.class);
int rows = hppInStockDetailMapper.insert(convert);
if (rows > 0) {
// System.out.println("更新成功");
WmsHppStorageDetail hppStorageDetail = new WmsHppStorageDetail();

27
ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml
Unescape Escape View File

@ -1,7 +1,30 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.wms.mapper.WmsHppInStockDetailMapper">
<resultMap id="hpp" type="org.dromara.wms.domain.vo.WmsHppInStockDetailVo">
<result property="materialCode" column="material_code"/>
<result property="materialId" column="material_id"/>
<result property="materialSpec" column="material_spec"/>
<result property="cardNo" column="return_barcode"/>
<result property="instockNum" column="complete_amount"/>
<result property="unitName" column="unit_name"/>
</resultMap>
<select id="semiSelectVehicleInfo" resultMap="hpp">
select top 1
complete_amount,
return_barcode,
prod.material_id,
base.material_spec,
base.material_code,
unit_name,
shift_id,
class_team_id
from prod_product_plan_detail_2 prod
left join base_material_info base on prod.material_id = base.material_id
where return_barcode=#{code}
</select>
</mapper>

Write Preview
Loading…
Cancel
Save