1.干线查询零担列表

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java

@@ -103,5 +103,9 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity {
 	/** 卸车确认 0未确认 1已确认*/
 	@ApiModelProperty(name = "卸车确认 0未确认 1已确认",notes = "")
 	private Integer unloadCheck ;
+	/** 是否补录 0否 1是*/
+	@ApiModelProperty(name = "是否补录 0否 1是",notes = "")
+	private Integer isSupple ;
+
 
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -1243,12 +1243,15 @@ public class CarsLoadController {
 	}
 
 	@ResponseBody
-	@PostMapping("/addZeroSupple")
+	@PostMapping("/useZeroList")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "增加零担补录", notes = "传入loadCarsDTO")
-	public R addZeroSupple(@RequestBody LoadCarsDTO loadCarsDTO) {
-		String method = "############addZeroSupple: ";
+	@ApiOperation(value = "已使用的零担补录列表", notes = "传入loadCarsDTO")
+	public R useZeroList(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############useZeroList: ";
 		log.info(method+"请求参数{}",loadCarsDTO);
+
+		Long loadId = loadCarsDTO.getLoadId();//配载id
+
 		try{
 
 			//当前登录人选择的仓库
@@ -1259,7 +1262,12 @@ public class CarsLoadController {
 			}
 			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
 
-			return carsLoadService.zeroSuppleList(loadCarsDTO);
+			if(Objects.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(405,"配载id为空");
+			}
+
+			return carsLoadService.useZeroList(loadCarsDTO);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java

@@ -1,5 +1,6 @@
 package com.logpm.trunkline.mapper;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.trunkline.dto.LoadCarsDTO;
@@ -30,4 +31,9 @@ public interface TrunklineCarsLoadMapper extends BaseMapper<TrunklineCarsLoadEnt
     IPage<TrunklineCarsLoadVO> arriveUnloadPageList(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
 
 	List<CarsLoadAllOrderVO> findUseOrderListNoPage(@Param("param") LoadCarsDTO loadCarsDTO);
+
+    IPage<JSONObject> findZeroListByWarehouseId(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
+
+	IPage<JSONObject> useZeroList(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
 }
+

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -339,4 +339,49 @@
         </if>
     </select>
 
+    <select id="findZeroListByWarehouseId" resultType="com.alibaba.fastjson.JSONObject">
+        select ldsa.waybill_number waybillNo,
+               ldsa.order_code orderCode,
+               lww.create_time createTime,
+               lww.destination destination,
+               lww.destination_warehouse_name destinationWarehouseName,
+               lww.shipper shipper,
+               lww.shipper_name shipperName,
+               lww.consignee consignee,
+               lww.consignee_name consigneeName,
+               lww.goods_name goodsName,
+               lww.total_count totalNum,
+               lww.total_weight weight,
+               lww.total_volume volume,
+               ldsa.hand_quantity stockNum,
+               lww.customer_train customerTrain,
+               IFNULL(lww.total_freight,0) totalFreight,
+               lww.total_count,
+               lww.remark remark,
+               ROUND(lww.total_freight/lww.total_count,2) price
+        from logpm_distribution_stock_article ldsa
+                 left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.waybill_number
+        where ldsa.is_zero = 1
+          and ldsa.warehouse_id = #{param.warehouseId}
+          <if test="param.orderCodes != null and param.orderCodes.length > 0">
+            and ldsa.order_code in
+            <foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+          </if>
+    </select>
+
+
+    <select id="useZeroList" resultType="com.alibaba.fastjson.JSONObject">
+        select ltcls.id carsLoadScanId,
+               ltcls.order_code orderCode,
+               ltcls.waybill_no waybillNo,
+               lww.create_time createTime,
+
+        from logpm_trunkline_cars_load_scan ltcls
+        left join logpm_warehouse_waybill lww on lww.waybill_no = ltcls.waybill_no
+        where ltcls.is_supple = 1
+        and ltcls.type = 2
+    </select>
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java

@@ -117,4 +117,5 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R zeroSuppleList(LoadCarsDTO loadCarsDTO);
 
+	R useZeroList(LoadCarsDTO loadCarsDTO);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1488,6 +1488,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		carsLoadScanEntity.setTrayCode(trayCode);
 		carsLoadScanEntity.setNum(1);
 		carsLoadScanEntity.setType(1);
+		carsLoadScanEntity.setIsSupple(0);
 		if(Objects.isNull(parcelListEntity)){
 			carsLoadScanEntity.setLoadingAbnormal(1);
 			isAbnormal = 1;
@@ -1711,6 +1712,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadScanEntity.setScanCode(goodsName);
 			carsLoadScanEntity.setScanStatus("1");
 			carsLoadScanEntity.setNum(enterNum);
+			carsLoadScanEntity.setIsSupple(0);
 			carsLoadScanEntity.setLoadingAbnormal(isAbnormal);
 			carsLoadScanEntity.setType(2);
 			carsLoadScanEntity.setIsData(isData);
@@ -1957,12 +1959,24 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	@Override
 	public R zeroSuppleList(LoadCarsDTO loadCarsDTO) {
 
-		Long warehouseId = loadCarsDTO.getWarehouseId();
-		Integer pageNum = loadCarsDTO.getPageNum();
-		Integer pageSize = loadCarsDTO.getPageSize();
+		IPage<Object> page = new Page<>();
+		page.setCurrent(loadCarsDTO.getPageNum());
+		page.setSize(loadCarsDTO.getPageSize());
 
 		//查询当前仓零担在库列表
-		IPage<JSONObject> pageList = distributionStockArticleClient.findZeroListByWarehouseId(warehouseId,pageNum,pageSize);
+//		IPage<JSONObject> pageList = distributionStockArticleClient.findZeroListByWarehouseId(warehouseId,pageNum,pageSize);
+		IPage<JSONObject> pageList = baseMapper.findZeroListByWarehouseId(page,loadCarsDTO);
+		return R.data(pageList);
+	}
+
+	@Override
+	public R useZeroList(LoadCarsDTO loadCarsDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(loadCarsDTO.getPageNum());
+		page.setSize(loadCarsDTO.getPageSize());
+
+		IPage<JSONObject> pageList = baseMapper.useZeroList(page,loadCarsDTO);
+
 
 		return R.data(pageList);
 	}