koushanshan пре 2 година
родитељ
комит
cbfb2940e8

+ 4 - 0
src/main/java/com/dk/mdm/controller/ivt/InboundController.java

@@ -109,4 +109,8 @@ public class InboundController{
         return inheritedPurchaseService.purchaseHandleInbound(inboundVO);
     }
 
+
+
+
+
 }

+ 11 - 0
src/main/java/com/dk/mdm/controller/ivt/InboundOtherController.java

@@ -107,4 +107,15 @@ public class InboundOtherController {
         return inboundOtherService.otherInboundCancel(inboundVO);
     }
 
+    /**
+     * @desc   : 获取单据信息(编辑用)
+     * @date   : 2024/3/14 16:37
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "获取单据信息(编辑用)", notes = "获取单据信息(编辑用)")
+    @PostMapping({"select_by_update/{id}"})
+    public ResponseResultVO<?> selectByUpdate(@PathVariable String id) {
+        return inboundOtherService.selectByUpdate(id);
+    }
+
 }

+ 18 - 0
src/main/java/com/dk/mdm/service/ivt/InboundOtherService.java

@@ -356,5 +356,23 @@ public class InboundOtherService extends BaseService<Inbound> {
 		}
 		return intoStatus;
 	}
+
+
+	/**
+	 * @desc   : 获取单据信息(编辑用)
+	 * @date   : 2024/3/14 16:38
+	 * @author : 寇珊珊
+	 */
+	public ResponseResultVO<?> selectByUpdate(String id) {
+		Map<String, Object> dataInfo = new HashMap<>();
+		//总单
+		InboundResponse inboundResponse = inboundMapper.selectById(id);
+		dataInfo.put("data", inboundResponse);
+
+		// 明细
+		List<InboundItemResponse> inboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(id));
+		dataInfo.put("dataItem", inboundItemResponses);
+		return ResponseResultUtil.success(dataInfo);
+	}
 	
 }

+ 6 - 0
src/main/java/com/dk/mdm/service/ivt/InboundService.java

@@ -18,10 +18,13 @@ import com.dk.mdm.model.query.ivt.InboundItemQuery;
 import com.dk.mdm.model.query.ivt.InboundQuery;
 import com.dk.mdm.model.query.pur.PurchaseItemQuery;
 import com.dk.mdm.model.query.pur.PurchaseQuery;
+import com.dk.mdm.model.query.sale.OrderItemQuery;
 import com.dk.mdm.model.response.ivt.InboundItemResponse;
 import com.dk.mdm.model.response.ivt.InboundResponse;
 import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.dk.mdm.model.response.pur.PurchaseResponse;
+import com.dk.mdm.model.response.sale.OrderItemResponse;
+import com.dk.mdm.model.response.sale.OrderResponse;
 import com.dk.mdm.model.vo.ivt.InboundVO;
 import com.dk.mdm.model.vo.mst.GoodsBrandVO;
 import com.dk.mdm.service.common.CommonService;
@@ -29,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -116,4 +120,6 @@ public class InboundService extends BaseService<Inbound> {
 	}
 
 
+
+
 }