提交 质检查询

ruoyi-modules/hwmom-api/src/main/resources/mapper/api/PdaApiMapper.xml

@@ -18,6 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      bemi.material_name
         from qc_inspection_task qc
                  left join base_material_info bemi on qc.material_id = bemi.material_id
-        where qc_material_code = #{code}
+        where sfc = #{code}
     </select>
 </mapper>

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java

@@ -339,6 +339,7 @@ public class WmsPdaApiController extends BaseController {
      */
     @PostMapping("/selectMachineStationList")
     public R<List<String>> selectMachineStationList(Long machineId) {
+        System.out.println("上位机机台："+machineId);
         List<String> list = apiService.selectMachineStationList(machineId);
         return list == null ? R.fail() : R.ok(list);
     }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java

@@ -2,6 +2,7 @@ package org.dromara.wms.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -98,4 +99,8 @@ public class WmsHppStorageDetail implements Serializable {
     @TableField(exist = false)
     private Date maxTime;
     private String unitName;
+
+    // private Long unitId;
+
+
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsReturnOrderBo.java

@@ -1,18 +1,12 @@
 package org.dromara.wms.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.wms.domain.WmsReturnOrder;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.wms.domain.WmsReturnOrder;
 
 /**
  * 退库工单业务对象 wms_return_order
@@ -22,7 +16,7 @@ import org.dromara.wms.domain.WmsReturnOrder;
  */
 @Data
 @AutoMapper(target = WmsReturnOrder.class, reverseConvertGenerate = false)
-public class WmsReturnOrderBo extends BaseEntity{
+public class WmsReturnOrderBo extends BaseEntity {
 
     /**
      * 表主键

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java

@@ -2,7 +2,6 @@ package org.dromara.wms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -45,11 +44,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
 
     @Override
     public WmsOutstockRecordVo returnSelectCode(String code) {
-        MPJLambdaWrapper<WmsOutstockRecord> lqw = JoinWrappers.lambda(WmsOutstockRecord.class)
-            .selectAll(WmsOutstockRecord.class)
-            .select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName, BaseMaterialInfo::getMaterialUnit,
-                BaseMaterialInfo::getMaterialSpec)
-            .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockRecord::getMaterialId).select(WmsBaseLocation::getWarehouseId).leftJoin(WmsBaseLocation.class, WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode).eq(WmsOutstockRecord::getBatchCode, code).eq(WmsOutstockRecord::getReturnFlag, 0).orderByDesc(WmsOutstockRecord::getCreateTime);
+        MPJLambdaWrapper<WmsOutstockRecord> lqw = JoinWrappers.lambda(WmsOutstockRecord.class).selectAll(WmsOutstockRecord.class).select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName, BaseMaterialInfo::getMaterialUnit, BaseMaterialInfo::getMaterialSpec).leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockRecord::getMaterialId).select(WmsBaseLocation::getWarehouseId).leftJoin(WmsBaseLocation.class, WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode).eq(WmsOutstockRecord::getBatchCode, code).eq(WmsOutstockRecord::getReturnFlag, 0).orderByDesc(WmsOutstockRecord::getCreateTime);
         return wmsOutstockRecordMapper.selectVoOne(lqw);
     }
 
@@ -133,8 +128,8 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
             hppStorageDetail.setObjId(null);
             hppStorageDetail.setStorageNum(vo.getInstockNum());
             BaseMaterialInfoVo baseMaterialInfoVo = baseMaterialInfoMapper.selectVoById(vo.getMaterialId());
-            hppStorageDetail.setMinParkingTime(baseMaterialInfoVo.getMinParkingTime() / 3600);
-            hppStorageDetail.setMaxParkingTime(baseMaterialInfoVo.getMaxParkingTime() / 3600);
+            hppStorageDetail.setMinParkingTime((double) baseMaterialInfoVo.getMinParkingTime() / 3600);
+            hppStorageDetail.setMaxParkingTime((double) baseMaterialInfoVo.getMaxParkingTime() / 3600);
             hppStorageDetailMapper.insert(hppStorageDetail);
             return true;
         }
@@ -329,8 +324,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
 
     @Override
     public Boolean storeCheckSubmitCheckRecord(WmsInventoryCheckRecord wmsInventoryCheckRecord) {
-        wmsInventoryCheckRecord.setCheckStatus(
-            wmsInventoryCheckRecord.getInventoryQty().compareTo(wmsInventoryCheckRecord.getCheckQty()) == 0 ? "0" : "1");
+        wmsInventoryCheckRecord.setCheckStatus(wmsInventoryCheckRecord.getInventoryQty().compareTo(wmsInventoryCheckRecord.getCheckQty()) == 0 ? "0" : "1");
         wmsInventoryCheckRecord.setCreateBy(LoginHelper.getUsername());
         wmsInventoryCheckRecordMapper.insert(wmsInventoryCheckRecord);
 
@@ -348,10 +342,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
 
     @Override
     public List<WmsHppStorePlaceVo> seimMoveSelectStoreLocation() {
-        MPJLambdaWrapper<WmsHppStorePlace> lqw = JoinWrappers.lambda(WmsHppStorePlace.class)
-            .select(WmsHppStorePlace::getStorePlaceCode, WmsHppStorePlace::getObjId)
-            .select(WmsHppStore::getStoreName)
-            .leftJoin(WmsHppStore.class, WmsHppStore::getObjId, WmsHppStorePlace::getStoreId);
+        MPJLambdaWrapper<WmsHppStorePlace> lqw = JoinWrappers.lambda(WmsHppStorePlace.class).select(WmsHppStorePlace::getStorePlaceCode, WmsHppStorePlace::getObjId).select(WmsHppStore::getStoreName).leftJoin(WmsHppStore.class, WmsHppStore::getObjId, WmsHppStorePlace::getStoreId);
         return wmsHppStorePlaceMapper.selectVoList(lqw);
 
     }