代码修改

src/main/java/org/springblade/api/CameraApiController.java

@@ -115,7 +115,7 @@ public class CameraApiController {
 								productEntity = new ProductEntity();
 								productEntity.setTenantId(productModel.getTenantId());
 								productEntity.setFactoryId(productModel.getFactoryId());
-								productEntity.setClientId(productModel.getClientId());
+//								productEntity.setClientId(productModel.getClientId());
 								productEntity.setProductModelId(productModel.getId());
 								productEntity.setProductName(productModel.getProductName());
 								productEntity.setProductModel(productModel.getProductModel());

src/main/java/org/springblade/applet/ProductApiController.java

@@ -1,5 +1,8 @@
 package org.springblade.applet;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,6 +13,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.modules.pl.client.entity.ClientEntity;
+import org.springblade.modules.pl.client.service.IClientService;
 import org.springblade.modules.pl.product.entity.ProductEntity;
 import org.springblade.modules.pl.product.service.IProductService;
 import org.springblade.modules.pl.product.vo.ProductVO;
@@ -19,9 +24,12 @@ import org.springblade.modules.pl.productBatch.vo.ProductBatchVO;
 import org.springblade.modules.pl.productModel.entity.ProductModelEntity;
 import org.springblade.modules.pl.productModel.service.IProductModelService;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @AllArgsConstructor
@@ -36,6 +44,41 @@ public class ProductApiController {
 
 	private final IProductModelService productModelService;
 
+	private final IClientService clientService;
+
+	/**
+	 * 产品表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入product")
+	public R<IPage<ProductVO>> list(@ApiIgnore @RequestParam Map<String, Object> product, Query query) {
+		query.setDescs("create_time");
+		BladeUser user = AuthUtil.getUser();
+		product.put("factoryId",user.getFactoryId());
+		QueryWrapper<ProductEntity> wrapper = Condition.getQueryWrapper(product,ProductEntity.class);
+		IPage<ProductEntity> pages = productService.page(Condition.getPage(query),wrapper);
+		return R.data(ProductWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 产品表 统计
+	 */
+	@GetMapping("/countProduct")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入product")
+	public R<Object> countProduct(@ApiIgnore @RequestParam Map<String, Object> product, Query query) {
+		BladeUser user = AuthUtil.getUser();
+		long countAll = productService.count(Wrappers.<ProductEntity>lambdaQuery().eq(ProductEntity::getFactoryId,user.getFactoryId()));
+		product.put("factoryId",user.getFactoryId());
+		QueryWrapper<ProductEntity> wrapper = Condition.getQueryWrapper(product,ProductEntity.class);
+		long count = productService.count(wrapper);
+		Map<String,Object> result = new HashMap<>();
+		result.put("countAll",countAll);
+		result.put("count",count);
+		return R.data(result);
+	}
+
 
 	/**
 	 * 产品表 详情
@@ -65,6 +108,23 @@ public class ProductApiController {
 	}
 
 
+
+	/**
+	 * 客户表 下拉框
+	 */
+	@GetMapping("/clientSelect")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "下拉框", notes = "传入factory")
+	public R<List<ClientEntity>> select(ClientEntity factory, Query query) {
+		BladeUser user = AuthUtil.getUser();
+		if(user.getUserCategory()==2){
+			factory.setFactoryId(user.getFactoryId());
+		}
+		List<ClientEntity> list = clientService.list(Condition.getQueryWrapper(factory));
+		return R.data(list);
+	}
+
+
 	/**
 	 * 产品型号表 下拉框
 	 */

src/main/java/org/springblade/modules/pl/client/controller/ClientController.java

@@ -79,6 +79,7 @@ public class ClientController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入client")
 	public R<IPage<ClientVO>> list(@ApiIgnore @RequestParam Map<String, Object> client, Query query) {
+		query.setDescs("create_time");
 		BladeUser user = AuthUtil.getUser();
 		if(user.getUserCategory()==2){
 			client.put("factory_id",user.getFactoryId());

src/main/java/org/springblade/modules/pl/equipment/controller/EquipmentController.java

@@ -78,6 +78,7 @@ public class EquipmentController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入equipment")
 	public R<IPage<EquipmentVO>> list(@ApiIgnore @RequestParam Map<String, Object> equipment, Query query) {
+		query.setDescs("create_time");
 		BladeUser user = AuthUtil.getUser();
 		if(user.getUserCategory()==2){
 			equipment.put("factory_id",user.getFactoryId());

src/main/java/org/springblade/modules/pl/factory/controller/FactoryController.java

@@ -76,6 +76,7 @@ public class FactoryController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入factory")
 	public R<IPage<FactoryVO>> list(@ApiIgnore @RequestParam Map<String, Object> factory, Query query) {
+		query.setDescs("create_time");
 		IPage<FactoryEntity> pages = factoryService.page(Condition.getPage(query), Condition.getQueryWrapper(factory, FactoryEntity.class));
 		return R.data(FactoryWrapper.build().pageVO(pages));
 	}

src/main/java/org/springblade/modules/pl/product/controller/ProductController.java

@@ -76,12 +76,25 @@ public class ProductController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入product")
-	public R<IPage<ProductVO>> list(@ApiIgnore @RequestParam Map<String, Object> product, Query query) {
+	public R<IPage<ProductVO>> list(ProductVO product, Query query) {
+		query.setDescs("create_time");
 		BladeUser user = AuthUtil.getUser();
 		if(user.getUserCategory()==2){
-			product.put("factory_id",user.getFactoryId());
+//			product.put("factory_id",user.getFactoryId());
+			product.setFactoryId(user.getFactoryId());
+		}
+		QueryWrapper<ProductEntity> wrapper = Condition.getQueryWrapper(product);
+		if(product.getScanDateArr()!=null){
+			String[]  scanDates  = product.getScanDateArr().split(",");
+			wrapper.lambda().ge(ProductEntity::getScanDate,scanDates[0]);
+			wrapper.lambda().le(ProductEntity::getScanDate,scanDates[1]);
+		}
+		if(product.getCreateTimeArr()!=null){
+			String[]  createTimes  = product.getCreateTimeArr().split(",");
+			wrapper.lambda().ge(ProductEntity::getCreateTime,createTimes[0]+" 00:00:00");
+			wrapper.lambda().le(ProductEntity::getCreateTime,createTimes[1]+" 23:59:59");
 		}
-		IPage<ProductEntity> pages = productService.page(Condition.getPage(query), Condition.getQueryWrapper(product, ProductEntity.class));
+		IPage<ProductEntity> pages = productService.page(Condition.getPage(query),wrapper);
 		return R.data(ProductWrapper.build().pageVO(pages));
 	}
 

src/main/java/org/springblade/modules/pl/product/controller/ProductImageRecordController.java

@@ -76,6 +76,7 @@ public class ProductImageRecordController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入productImageRecord")
 	public R<IPage<ProductImageRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> productImageRecord, Query query) {
+		query.setDescs("create_time");
 		IPage<ProductImageRecordEntity> pages = productImageRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(productImageRecord, ProductImageRecordEntity.class));
 		return R.data(ProductImageRecordWrapper.build().pageVO(pages));
 	}

src/main/java/org/springblade/modules/pl/product/vo/ProductVO.java

@@ -32,4 +32,7 @@ import lombok.EqualsAndHashCode;
 public class ProductVO extends ProductEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String createTimeArr;
+	private String scanDateArr;
+
 }

src/main/java/org/springblade/modules/pl/productBatch/controller/ProductBatchController.java

@@ -91,6 +91,7 @@ public class ProductBatchController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入productBatch")
 	public R<IPage<ProductBatchVO>> list(@ApiIgnore @RequestParam Map<String, Object> productBatch, Query query) {
+		query.setDescs("create_time");
 		BladeUser user = AuthUtil.getUser();
 		if(user.getUserCategory()==2){
 			productBatch.put("factory_id",user.getFactoryId());

src/main/java/org/springblade/modules/pl/productBatch/entity/ProductBatchEntity.java

@@ -49,6 +49,11 @@ public class ProductBatchEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "批次号")
 	private String batchNo;
+	/**
+	 * 所属客户
+	 */
+	@ApiModelProperty(value = "所属客户")
+	private Long clientId;
 	/**
 	 * 产品型号id
 	 */
@@ -64,5 +69,10 @@ public class ProductBatchEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "产品型号")
 	private String productModel;
+	/**
+	 * 产品型号
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
 
 }

src/main/java/org/springblade/modules/pl/productBatch/service/impl/ProductBatchServiceImpl.java

@@ -21,6 +21,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.modules.pl.product.entity.ProductEntity;
 import org.springblade.modules.pl.product.service.IProductService;
 import org.springblade.modules.pl.productBatch.entity.ProductBatchEntity;
@@ -99,18 +100,24 @@ public class ProductBatchServiceImpl extends BaseServiceImpl<ProductBatchMapper,
 				productEntity.setInStockDate(new Date());
 				productEntity.setStatus(3);
 			}
-			String batchNo = productBatch.getDetails().get(0).getQrCode().substring(0,25)+DateUtil.format(new Date(),"yyyyMMdd")+"00001";
+			String batchNo = productBatch.getDetails().get(0).getQrCode().substring(0,21)+DateUtil.format(new Date(),"yyyyMMdd")+"00001";
 			ProductBatchEntity productBatchEntity = new ProductBatchEntity();
 			productBatchEntity.setFactoryId(productBatch.getFactoryId());
 			productBatchEntity.setBatchNo(batchNo);
 			productBatchEntity.setProductModelId(productModel.getId());
 			productBatchEntity.setProductName(productModel.getProductName());
 			productBatchEntity.setProductModel(productModel.getProductModel());
+			productBatchEntity.setClientId(productModel.getClientId());
+			productBatchEntity.setOrderNo(productBatch.getOrderNo());
 			this.save(productBatchEntity);
 
 			for(ProductEntity productEntity : productBatch.getDetails()){
 				productEntity.setBatchId(productBatchEntity.getId());
 				productEntity.setBatchNo(productBatchEntity.getBatchNo());
+				productEntity.setClientId(productBatch.getClientId());
+				if(StringUtil.isBlank(productEntity.getOrderNo())){
+					productEntity.setOrderNo(productBatchEntity.getOrderNo());
+				}
 				productService.updateById(productEntity);
 			}
 

src/main/java/org/springblade/modules/pl/productModel/controller/ProductModelController.java

@@ -80,6 +80,7 @@ public class ProductModelController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入productModel")
 	public R<IPage<ProductModelVO>> list(@ApiIgnore @RequestParam Map<String, Object> productModel, Query query) {
+		query.setDescs("create_time");
 		BladeUser user = AuthUtil.getUser();
 		if(user.getUserCategory()==2){
 			productModel.put("factory_id",user.getFactoryId());

src/main/java/org/springblade/modules/pl/productRework/controller/ProductReworkController.java

@@ -77,6 +77,7 @@ public class ProductReworkController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入productRework")
 	public R<IPage<ProductReworkVO>> list(@ApiIgnore @RequestParam Map<String, Object> productRework, Query query) {
+		query.setDescs("create_time");
 		BladeUser user = AuthUtil.getUser();
 		if(user.getUserCategory()==2){
 			productRework.put("factory_id",user.getFactoryId());

src/main/java/org/springblade/modules/pl/productRework/entity/ProductReworkEntity.java

@@ -106,6 +106,12 @@ public class ProductReworkEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "维修图片")
 	private String reworkImgs;
+	/**
+	 * 上报人名称
+	 */
+	@ApiModelProperty(value = "上报人名称")
+	private String createPersonName;
+
 
 
 }

src/main/java/org/springblade/modules/pl/productRework/service/impl/ProductReworkServiceImpl.java

@@ -110,7 +110,7 @@ public class ProductReworkServiceImpl extends BaseServiceImpl<ProductReworkMappe
 					ProductEntity productEntity = new ProductEntity();
 					productEntity.setTenantId(productModel.getTenantId());
 					productEntity.setFactoryId(productModel.getFactoryId());
-					productEntity.setClientId(productModel.getClientId());
+//					productEntity.setClientId(productModel.getClientId());
 					productEntity.setProductModelId(productModel.getId());
 					productEntity.setProductName(productModel.getProductName());
 					productEntity.setProductModel(productModel.getProductModel());
@@ -127,6 +127,7 @@ public class ProductReworkServiceImpl extends BaseServiceImpl<ProductReworkMappe
 					productReworkEntity.setRepairsImgs(productRework.getRepairsImgs());
 					productReworkEntity.setProblemDesc(productRework.getProblemDesc());
 					productReworkEntity.setStatus(1);
+					productReworkEntity.setCreatePersonName(user.getNickName());
 					this.save(productReworkEntity);
 				}
 			} finally {