zy-asrs.git - Gitblit

			@@ -9,6 +9,7 @@
			import com.zy.asrs.service.OrderDetlService;
			import org.springframework.stereotype.Service;

			import java.util.Collections;
			import java.util.List;

			@Service("orderDetlService")
			@@ -22,6 +23,20 @@
			@Override
			public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
			page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
			page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
			return page;
			}

			@Override
			public Page<OrderDetl> getPakoutPagexs(Page<OrderDetl> page) {
			page.setRecords(baseMapper.getPakoutPagexs(page.getCondition()));
			page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
			return page;
			}

			@Override
			public Page<OrderDetl> getPakoutPagenotxs(Page<OrderDetl> page) {
			page.setRecords(baseMapper.getPakoutPagenotxs(page.getCondition()));
			page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
			return page;
			}
			@@ -102,7 +117,7 @@
			* @return
			*/
			@Override
			public boolean increaseWorkQty2(Long orderId, String matnr, String batch, Double workQty, String color) {
			public boolean increaseWorkQty2(Long orderId, String matnr, String batch, Double workQty, Long color) {
			return this.baseMapper.increaseWorkQty2(orderId, matnr, batch, workQty, color) > 0;
			}

			@@ -119,4 +134,9 @@
			public boolean increaseWorkQtytest(String orderNo, String matnr, String batch, Double anfme) {
			return this.baseMapper.increaseWorkQtytest(orderNo, matnr, batch, anfme) > 0;
			}

			@Override
			public List<OrderDetl> reportERPOrderDetl() {
			return this.baseMapper.reportERPOrderDetl();
			}
			}