1.修改时间查询

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java

@@ -76,6 +76,11 @@ public class DistributionPackagereceiptEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "签收明细id")
 	private Long receiptDetailsId;
+	/**
+	 * 主表签收表Id
+	 */
+	@ApiModelProperty(value = "主表签收表Id")
+	private Long masterId;
 	/**
 	 * 签收数量
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java

@@ -26,6 +26,7 @@ import java.math.BigInteger;
 import java.util.Date;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 签收明细 实体类
@@ -113,7 +114,7 @@ public class DistributionSigndetailEntity extends TenantEntity {
 	 * 入库时间
 	 */
 	@ApiModelProperty(value = "入库时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date warehousingTime;
 	/**
 	 * 备货时间

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSigndetailController.java

@@ -52,6 +52,9 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import springfox.documentation.annotations.ApiIgnore;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -93,6 +96,7 @@ public class DistributionSigndetailController extends BladeController {
 		distributionSigndetailVO.setDistributionPackagereceiptVOList(distributionPackagereceiptVOList);
 		return R.data(distributionSigndetailVO);
 	}
+
 	/**
 	 * 签收明细 分页
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -25,6 +25,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -57,6 +58,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/signfor")
 @Api(value = "签收管理", tags = "签收管理接口")
+@Slf4j
 public class DistributionSignforController extends BladeController {
 
 	private final IDistributionSignforService distributionSignforService;
@@ -84,7 +86,12 @@ public class DistributionSignforController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionSignfor")
 	public R<IPage<DistributionSignforEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionSignfor, Query query) {
-		IPage<DistributionSignforEntity> pages = distributionSignforService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class));
+		QueryWrapper<DistributionSignforEntity> queryWrapper = Condition.getQueryWrapper(distributionSignfor, DistributionSignforEntity.class);
+		//不查询文员
+		if (distributionSignfor.containsKey("signingStatus_notequal") && distributionSignfor.get("signingStatus_notequal").equals("2")){
+			queryWrapper.lambda().ne(DistributionSignforEntity::getSigningStatus,"3");
+		}
+		IPage<DistributionSignforEntity> pages = distributionSignforService.page(Condition.getPage(query),queryWrapper);
 		return R.data(pages);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java

@@ -21,6 +21,7 @@ import com.logpm.distribution.entity.DistributionSigndetailEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -49,7 +50,11 @@ public class DistributionSigndetailDTO extends DistributionSigndetailEntity {
 	 */
 	@ApiModelProperty(value = "收货地址")
 	private String deliveryAddress;
-
+	/**
+	 * 服务号
+	 */
+	@ApiModelProperty(value = "服务号")
+	private String serviceNumber;
 
 	/**
 	 * 签收时间

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionPackagereceiptMapper.xml

@@ -34,7 +34,28 @@
         SELECT * FROM logpm_distribution_packagereceipt ${ew.customSqlSegment}
     </select>
     <select id="selectListByMasterId" resultType="com.logpm.distribution.vo.DistributionPackagereceiptVO">
-
+        SELECT
+            ldpg.id id,
+            ldpl.warehouse warehouse,
+            ldpl.conditions conditions,
+            ldpl.packet_bar_code packetBarCode,
+            ldpl.goods_allocation goodsAllocation,
+            ldpl.pallet pallet,
+            ldpl.firsts firsts,
+            ldpl.second second,
+            ldpl.third_product thirdProduct,
+            ldpl.material material,
+            ldpl.quantity quantity,
+            ldsf.service_number serviceNumber,
+            ldsf.train_number trainNumber,
+            ldpg.state state,
+            ldpg.received_quantity stareceivedQuantityte
+        FROM
+            logpm_distribution_packagereceipt ldpg
+                JOIN logpm_distribution_parcel_list ldpl ON ldpg.wrap_bar_id = ldpl.id
+                JOIN logpm_distribution_signfor ldsf ON ldpg.master_id = ldsf.id
+        WHERE
+            ldpg.is_deleted = 0
     </select>
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml

@@ -19,7 +19,7 @@
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
         <result column="master_id" property="masterId"/>
-        <result column="service_number" property="serviceNumber"/>
+<!--        <result column="service_number" property="serviceNumber"/>-->
         <result column="delivery_number" property="deliveryNumber"/>
         <result column="train_number" property="trainNumber"/>
         <result column="serve_type" property="serveType"/>
@@ -100,6 +100,9 @@
             <if test="param.consigneePhone!=null and param.consigneePhone!=''">
                 and ldsd.consignee_phone like concat('%',#{param.consigneePhone},'%')
             </if>
+            <if test="param.warehousingTime!=null and param.warehousingTime!=''">
+                and  ldsd.warehousing_time =  #{param.warehousingTime}
+            </if>
         </where>
             order by ldsd.create_time desc
     </select>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionPackagereceiptServiceImpl.java

@@ -55,7 +55,9 @@ public class DistributionPackagereceiptServiceImpl extends BaseServiceImpl<Distr
 
 	@Override
 	public List<DistributionPackagereceiptVO> getListByMasterId(Long id) {
-		return baseMapper.selectListByMasterId(id);
+		//查询包条信息
+		List<DistributionPackagereceiptVO> distributionPackagereceiptVOS = baseMapper.selectListByMasterId(id);
+		return distributionPackagereceiptVOS;
 	}
 
 }