CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang

Browse Source 
 Conflicts:
	ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
This commit is contained in:
闫阳
2023-03-06 11:55:29 +08:00
parent bf0d6108a1 05684b5d2a
commit cd1bfc3287
26 changed files with 769 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
View File

@@ -3,10 +3,14 @@ package com.cnbm.packing.service;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.IdVo;
import com.cnbm.packing.dto.PowerReportDTO;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import com.cnbm.packing.param.PowerReportQueryParam;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -36,4 +40,7 @@ public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, Wo
int updateIsArrivedByBoxNo(Integer isArrived, String boxNo);
List<PowerReportDTO> powerReport(PowerReportQueryParam queryParam);
List<String> orderNameList();
}