修改 出库

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

@@ -2,7 +2,6 @@ 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;
@@ -31,7 +30,7 @@ public class MachineApiController extends BaseController {
      *
      * @param vo xinx
      */
-    @ApiEncrypt
+
     @PostMapping("/semi/submitInstore")
     public R<Void> semiSubmitInStoreInfo(@RequestBody WmsHppInStockDetailVo vo) {
         // 验证库位条码

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

@@ -1,4 +1,4 @@
-package org.dromara.wms.controller;
+package org.dromara.wms.controller.api;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -28,8 +28,16 @@ public class WmsPdaApiController extends BaseController {
      * 原材料退库-现场扫描
      */
     @PostMapping("/raw/returnSelectCode")
-    public R<WmsOutstockRecordVo> returnSelectCode(String code) {
+    public R<WmsOutstockRecordVo> returnSelectCode(String code,int type) {
-        WmsOutstockRecordVo wmsOutstockRecordVo = apiService.returnSelectCode(code);
+
+        WmsOutstockRecordVo wmsOutstockRecordVo = null;
+        if (type == 1) {
+
+            wmsOutstockRecordVo = apiService.returnSelectCode(code);
+        } else if (type == 2) {
+            wmsOutstockRecordVo = apiService.setHppOutRecord(code);
+        }
+
 
         if (wmsOutstockRecordVo == null) {
             return R.fail("条码错误，不能退库");

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

@@ -1,9 +1,7 @@
 package org.dromara.wms.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.util.Date;
@@ -80,10 +78,12 @@ public class WmsHppOutStockDetail{
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
-    @TableField(exist = false)
+    // @TableField(exist = false)
     private String storePlaceCode;
     @TableField(exist = false)
     private String targertStorePlaceCode;
 
+    private Long materialId;
+
 
 }

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

@@ -1,12 +1,13 @@
 package org.dromara.wms.domain.bo;
 
-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 jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.wms.domain.WmsHppOutStockDetail;
 
 /**
@@ -62,5 +63,5 @@ public class WmsHppOutStockDetailBo extends BaseEntity {
     @NotNull(message = "目的库位不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long targetStorePlaceId;
 
-
+    private Long materialId;
 }

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

@@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.wms.domain.WmsHppOutStockDetail;
@@ -97,6 +95,6 @@ public class WmsHppOutStockDetailVo implements Serializable {
     private Date updateTime;
     private String storePlaceCode;
     private String targertStorePlaceCode;
-
+    private Long materialId;
 
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorageDetailMapper.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface WmsHppStorageDetailMapper extends BaseMapperPlus<WmsHppStorageDetail, WmsHppStorageDetailVo> {
-    @Select("select top 1 obj_id, card_no,shelf_no,material_id,storage_num,material_code,unit_name,create_time," +
+    @Select("select top 1 obj_id, card_no,shelf_no,material_id,store_place_code,storage_num,material_code,unit_name,create_time," +
         "       dateadd(hh, min_parking_time, create_time) as min_time,dateadd(hh, max_parking_time, create_time) as max_time " +
         "from wms_hpp_storage_detail where card_no=#{code} ")
     WmsHppStorageDetailVo selectHppStorageDetailInfobyCode(String code);

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java

@@ -4,10 +4,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.dromara.wms.domain.*;
-import org.dromara.wms.domain.vo.StoreInfoVo;
+import org.dromara.wms.domain.vo.*;
-import org.dromara.wms.domain.vo.TeamInfoVo;
-import org.dromara.wms.domain.vo.WmsBaseLocationVo;
-import org.dromara.wms.domain.vo.WmsPsmInLoadVo;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -55,4 +52,6 @@ public interface WmsPdaApiMapper {
 
     @Select("select station_code from prod_base_station_info where machine_id=#{machineId} and del_flag=0")
     List<String> selectMachineStationList(@Param("machineId") Long machineId);
+
+    WmsOutstockRecordVo setHppOutRecord(String code);
 }

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

@@ -64,4 +64,6 @@ public interface IWmsPdaApiService {
     TyreInfo productBindSelectTyreCode(String code);
 
     List<String> selectMachineStationList(Long machineId);
+
+    WmsOutstockRecordVo setHppOutRecord(String code);
 }

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

@@ -45,7 +45,11 @@ 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);
     }
 
@@ -129,8 +133,8 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
             hppStorageDetail.setObjId(null);
             hppStorageDetail.setStorageNum(vo.getInstockNum());
             BaseMaterialInfoVo baseMaterialInfoVo = baseMaterialInfoMapper.selectVoById(vo.getMaterialId());
-            hppStorageDetail.setMinParkingTime(baseMaterialInfoVo.getMinParkingTime());
+            hppStorageDetail.setMinParkingTime(baseMaterialInfoVo.getMinParkingTime() / 3600);
-            hppStorageDetail.setMaxParkingTime(baseMaterialInfoVo.getMaxParkingTime());
+            hppStorageDetail.setMaxParkingTime(baseMaterialInfoVo.getMaxParkingTime() / 3600);
             hppStorageDetailMapper.insert(hppStorageDetail);
             return true;
         }
@@ -162,6 +166,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
         BeanUtils.copyProperties(vo, outStockDetail);
         outStockDetail.setObjId(null);
         outStockDetail.setCreateBy(LoginHelper.getUsername());
+        // System.out.println(outStockDetail.getStorePlaceCode());
         hppOutStockDetailMapper.insert(outStockDetail);
         return true;
     }
@@ -386,4 +391,9 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
         System.out.println(machineId);
         return apiMapper.selectMachineStationList(machineId);
     }
+
+    @Override
+    public WmsOutstockRecordVo setHppOutRecord(String code) {
+        return apiMapper.setHppOutRecord(code);
+    }
 }

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml

@@ -151,6 +151,13 @@
        select material_id,return_barcode from prod_product_plan_detail_4 where  return_barcode =#{code}
     </select>
 
+    <resultMap id="OutRecord" type="org.dromara.wms.domain.vo.WmsOutstockRecordVo">
+
+    </resultMap>
+
+    <select id="setHppOutRecord" resultMap="OutRecord">
+
+    </select>
 
 
 </mapper>