yzc hace 2 años
padre
commit
d2c0a5d19f

+ 1 - 1
hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -148,7 +148,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     @Override
     public Page<ProductInfoVo> getCombinationPage(ProductInfoSelectDto dto) {
         dto.setCombination(1);
-        Page<ProductInfoVo> page = getPage(dto);
+        Page<ProductInfoVo> page = getPageByWdly(dto);
         return page;
     }
 

+ 1 - 1
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -96,7 +96,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
     public Page<QualityInfoVo> getPage1(QualityInfoSelectDto dto) {
         IWrapper<QualityInfo> wrapper = getWrapper();
         wrapper.orderByDesc("qi", QualityInfo::getId);
-        wrapper.eq(QualityInfoVo::getQualityStatus,dto.getQualityStatus());
+        wrapper.eq("asr",QualityInfoVo::getQualityStatus,dto.getQualityStatus());
         Page<QualityInfoVo> page = this.baseMapper.getPage1(dto.getPage(), wrapper);
         List<QualityInfoVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {

+ 1 - 1
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/stock/impl/StockTransferServiceImpl.java

@@ -249,7 +249,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
         //创建入库记录
         StockJournal stockJournal1 = new StockJournal();
-        stockJournal1.setCode(com.fjhx.wms.utils.CodeEnum.STOCK_TRANSFER.getCode());
+        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockJournal1.setOpType(1);//入库
         stockJournal1.setType(JournalType.ADJUSTING_IN.getDetailType());//调仓出库
         stockJournal1.setWarehouseId(stockTransferDto.getInWarehouseId());